Disable merge button when db is locked. #1881
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
louib
requested review from
droidmonkey and
a team
and removed request for
droidmonkey
droidmonkey
approved these changes
Apr 28, 2018
| bool inDatabaseTabWidget = (currentIndex == DatabaseTabScreen); | ||
| bool inWelcomeWidget = (currentIndex == WelcomeScreen); | ||
| bool inDatabaseTabWidgetOrWelcomeWidget = inDatabaseTabWidget || inWelcomeWidget; |
There was a problem hiding this comment.
Isn't this condition always true?
There was a problem hiding this comment.
No, we have 4 option for the currentIndex
keepassxc/src/gui/MainWindow.h
Line 50 in dd246f1
|
@droidmonkey I managed to add a unit test after all! |
|
@louib can you rebase this? |
|
@TheZ3ro will do! |
|
@TheZ3ro looks like it's already up-to-date with |
|
@louib github tells me that |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to #1875
Description
This patch disables the merge button when the current database is locked.
Motivation and context
Attempting to merge the database when the db is locked can cause database corruption, as stated in #1875
How has this been tested?
Locally. Had a hard time writing unit tests for the GUI.
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]