From 8ffc77be71507825a8f7585bcabff8ccc370206a Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 8 Dec 2018 20:12:16 +0300
Subject: db_get_sa / db_get_wsa to receive the default value, massive code
 simplification

---
 protocols/MinecraftDynmap/src/chat.cpp    | 6 +-----
 protocols/MinecraftDynmap/src/dialogs.cpp | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'protocols/MinecraftDynmap/src')

diff --git a/protocols/MinecraftDynmap/src/chat.cpp b/protocols/MinecraftDynmap/src/chat.cpp
index 50be132450..05b1385fb5 100644
--- a/protocols/MinecraftDynmap/src/chat.cpp
+++ b/protocols/MinecraftDynmap/src/chat.cpp
@@ -161,11 +161,7 @@ void MinecraftDynmapProto::SetChatStatus(int status)
 	if (status == ID_STATUS_ONLINE)
 	{		
 		// Load actual name from database
-		ptrA nick(db_get_sa(0, m_szModuleName, MINECRAFTDYNMAP_KEY_NAME));
-		if (!nick) {
-			nick = mir_strdup(Translate("You"));
-			db_set_s(0, m_szModuleName, MINECRAFTDYNMAP_KEY_NAME, nick);
-		}
+		ptrA nick(db_get_sa(0, m_szModuleName, MINECRAFTDYNMAP_KEY_NAME, Translate("You")));
 		m_nick = nick;
 
 		// Add self contact
diff --git a/protocols/MinecraftDynmap/src/dialogs.cpp b/protocols/MinecraftDynmap/src/dialogs.cpp
index f682fd5c7b..6c93788c81 100644
--- a/protocols/MinecraftDynmap/src/dialogs.cpp
+++ b/protocols/MinecraftDynmap/src/dialogs.cpp
@@ -48,7 +48,7 @@ HANDLE GetIconHandle(const char* name) {
 
 static void LoadDBText(MinecraftDynmapProto* ppro, HWND hwnd, int idCtrl, const char* szSetting)
 {
-	ptrW tstr(db_get_wsa(NULL, ppro->m_szModuleName, szSetting));
+	ptrW tstr(db_get_wsa(0, ppro->m_szModuleName, szSetting));
 	if (tstr)
 		SetDlgItemText(hwnd, idCtrl, tstr);
 }
-- 
cgit v1.2.3