merge with master till

fixes #1368 (Hide dbx_mmap from profile manager)

5 files changed, 6 insertions, 6 deletions

diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index c3130cb271..cc030252d6 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -387,9 +387,8 @@ BEGIN
     LTEXT           "Profile",IDC_STATIC,20,23,38,9

     LTEXT           "e.g., Workplace",IDC_STATIC,62,35,77,9

     LTEXT           "You can select a different database driver from the default, it may offer more features or abilities, if in doubt use the default.",IDC_STATIC,4,46,207,24

-    LTEXT           "e.g., dbx mmap",IDC_STATIC,62,91,84,11

     LTEXT           "Driver",IDC_STATIC,20,77,37,9

-    LTEXT           "Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mmap.dll",IDC_NODBDRIVERS,4,104,203,22,NOT WS_VISIBLE

+    LTEXT           "Problem: Unable to find any database drivers, this means you cannot create a new profile, you need to get dbx_mdbx.dll",IDC_NODBDRIVERS,4,104,203,22,NOT WS_VISIBLE

 END

 

 IDD_OPT_PLUGINS DIALOGEX 0, 0, 315, 252

diff --git a/src/mir_app/src/CMPluginBase.cpp b/src/mir_app/src/CMPluginBase.cpp
index e30fdb3320..6a52664e89 100644
--- a/src/mir_app/src/CMPluginBase.cpp
+++ b/src/mir_app/src/CMPluginBase.cpp
@@ -40,7 +40,7 @@ CMPluginBase::~CMPluginBase()
 void CMPluginBase::tryOpenLog()
 {
 	wchar_t path[MAX_PATH];
-	mir_snwprintf(path, L"%s\\%s.txt", VARSW(L"%miranda_logpath%"), m_szModuleName);
+	mir_snwprintf(path, L"%s\\%S.txt", VARSW(L"%miranda_logpath%"), m_szModuleName);
 	m_hLogger = mir_createLog(m_szModuleName, nullptr, path, 0);
 }
 
diff --git a/src/mir_app/src/database.cpp b/src/mir_app/src/database.cpp
index 62b070129e..12de009718 100644
--- a/src/mir_app/src/database.cpp
+++ b/src/mir_app/src/database.cpp
@@ -464,7 +464,7 @@ int findMirandaForProfile(wchar_t *szProfile)
 	return x.found;

 }

 

-static wchar_t tszNoDrivers[] = LPGENW("Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll");

+static wchar_t tszNoDrivers[] = LPGENW("Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mdbx.dll");

 static wchar_t tszUnknownFormat[] = LPGENW("Miranda was unable to open '%s', it's in an unknown format.");

 static wchar_t tszProfileLocked[] = LPGENW("Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance");

 static wchar_t tszNoSuitableDriver[] = LPGENW("Miranda was unable to open '%s'\nThere is no suitable database driver installed");

diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h
index 645fd36013..660b85474e 100644
--- a/src/mir_app/src/miranda.h
+++ b/src/mir_app/src/miranda.h
@@ -199,6 +199,6 @@ MBaseProto* Proto_GetProto(const char *szProtoName);
 

 extern "C"

 {

-	MIR_CORE_DLL(int)  Langpack_MarkPluginLoaded(PLUGININFOEX* pInfo);

+	MIR_CORE_DLL(int)  Langpack_MarkPluginLoaded(const MUUID &uuid);

 	MIR_CORE_DLL(int)  GetSubscribersCount(struct THook *hHook);

 };

diff --git a/src/mir_app/src/profilemanager.cpp b/src/mir_app/src/profilemanager.cpp
index 07ae55e4a1..21bf6fa990 100644
--- a/src/mir_app/src/profilemanager.cpp
+++ b/src/mir_app/src/profilemanager.cpp
@@ -149,7 +149,8 @@ public:
 		}
 		else {
 			for (auto &p : arDbPlugins)
-				m_driverList.AddString(TranslateW(p->szFullName), (LPARAM)p);
+				if (p->capabilities & MDB_CAPS_CREATE)
+					m_driverList.AddString(TranslateW(p->szFullName), (LPARAM)p);
 		}
 
 		// default item