summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-08-18 12:55:50 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-08-18 12:55:50 +0300
commit28d0e917496ecfd681e8cd3e3032519867993f9b (patch)
treeea1e41aac6594e82694de461ea3bdbcdd1fcb33a
parent775403f88b6bfe4c36dc72eddc067488142e40c0 (diff)
fixes #1463 (old behavior of smart profile opening must be returned)
-rw-r--r--src/mir_app/src/database.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mir_app/src/database.cpp b/src/mir_app/src/database.cpp
index 58e731c567..002be18879 100644
--- a/src/mir_app/src/database.cpp
+++ b/src/mir_app/src/database.cpp
@@ -255,6 +255,12 @@ static int getProfile1(wchar_t *szProfile, size_t cch, wchar_t *profiledir, BOOL
continue;
switch (touchDatabase(newProfile, nullptr)) {
+ case EGROKPRF_CANTREAD:
+ // profile might be locked by another Miranda
+ if (!Profile_CheckOpened(newProfile))
+ break;
+ __fallthrough;
+
case 0:
case EGROKPRF_OBSOLETE:
if (++found == 1 && bNoDefaultProfile)