Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct latent single instance lock file preventing launch #997

Merged
merged 1 commit into from
Sep 27, 2017

Conversation

droidmonkey
Copy link
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
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
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
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
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 that 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 that fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants