fixes #2871 (Crash at SRMM window open)

1 files changed, 7 insertions, 5 deletions

diff --git a/src/mir_app/src/srmm_log.cpp b/src/mir_app/src/srmm_log.cpp
index 692922236f..42b103e7f8 100644
--- a/src/mir_app/src/srmm_log.cpp
+++ b/src/mir_app/src/srmm_log.cpp
@@ -79,19 +79,21 @@ static bool sttEnableCustomLogs(CMsgDialog *pDlg)
 
 CSrmmLogWindow* Srmm_GetLogWindow(CMsgDialog *pDlg)
 {
-	CMStringA szViewerName;
 	if (sttEnableCustomLogs(pDlg)) {
-		szViewerName = db_get_sm(pDlg->m_hContact, "SRMsg", "Logger");
+		CMStringA szViewerName(db_get_sm(pDlg->m_hContact, "SRMsg", "Logger"));
 		if (szViewerName.IsEmpty())
 			szViewerName = db_get_sm(0, "SRMM", "Logger", "built-in");
+
+		for (auto &it : g_arLogClasses)
+			if (szViewerName == it->szShortName)
+				return it->pfnBuilder(*pDlg);
 	}
-	else szViewerName = "built-in";
 
 	for (auto &it : g_arLogClasses)
-		if (szViewerName == it->szShortName)
+		if (!mir_strcmp(it->szShortName, "built-in"))
 			return it->pfnBuilder(*pDlg);
 
-	return nullptr;
+	return nullptr; // shall never happen
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////