Skip to content

Correct latent single instance lock file preventing launch#997

Merged
droidmonkey merged 1 commit intorelease/2.2.1from
hotfix/single-instance
Sep 27, 2017
Merged

Correct latent single instance lock file preventing launch#997
droidmonkey merged 1 commit intorelease/2.2.1from
hotfix/single-instance

Conversation

@droidmonkey
Copy link
Copy Markdown
Member

Description

I also took the opportunity to bring this code into alignment with the coding standards for variable naming.

Motivation and context

This issue has been reported 4 times since release of 2.2.0.

How has this been tested?

Manually

Types of changes

  • ✅ Bug fix (non-breaking change which fixes an issue)

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ✅ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]

@droidmonkey droidmonkey added this to the v2.2.1 milestone Sep 26, 2017
if (!m_alreadyRunning) {
// If we get here then the original instance is likely dead
// forceably reset the lock file
m_lockFile->removeStaleLockFile();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@droidmonkey Maybe we could add a qDebug or qWarn here? Might be useful for debugging purposes.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, I'll add that tonight

@droidmonkey droidmonkey force-pushed the hotfix/single-instance branch from 793dc70 to 2b69b40 Compare September 27, 2017 01:41
Copy link
Copy Markdown
Contributor

@TheZ3ro TheZ3ro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine and works great.
Any specific reason to use + instead of .append for strings?

@droidmonkey
Copy link
Copy Markdown
Member Author

droidmonkey commented Sep 27, 2017

Consistency in the code and i think it reads better. Bouncing between Kotlin and C++ I can never remember what is immutable and what isn't.

@droidmonkey droidmonkey merged commit 9ebe0b6 into release/2.2.1 Sep 27, 2017
@droidmonkey droidmonkey deleted the hotfix/single-instance branch September 27, 2017 22:34
droidmonkey added a commit that referenced this pull request Oct 1, 2017
- Corrected multiple snap issues [#934, #1011]
- Corrected multiple custom icon issues [#708, #719, #994]
- Corrected multiple Yubikey issues [#880]
- Fixed single instance preventing load on occasion [#997]
- Keep entry history when merging databases [#970]
- Prevent data loss if passwords were mismatched [#1007]
- Fixed crash after merge [#941]
- Added configurable auto-type default delay [#703]
- Unlock database dialog window comes to front [#663]
- Translation and compiling fixes
@phoerious phoerious added pr: bugfix Pull request fixes a bug and removed bug labels Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr: bugfix Pull request fixes a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants