3 files changed, 10 insertions, 7 deletions
diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp
index a4d3556299..e413c192e3 100644
--- a/plugins/GmailNotifier/src/main.cpp
+++ b/plugins/GmailNotifier/src/main.cpp
@@ -36,7 +36,7 @@ static PLUGININFOEX pluginInfoEx =
 	{ 0x243955e0, 0x75d9, 0x4cc3, { 0x9b, 0x28, 0x6f, 0x9c, 0x5a, 0xf4, 0x53, 0x2d } }
 };
 
-INT_PTR GetCaps(WPARAM wParam, LPARAM lParam)
+INT_PTR GetCaps(WPARAM wParam, LPARAM)
 {
 	if (wParam == PFLAGNUM_2 && opt.ShowCustomIcon)
 		return PF2_ONLINE | PF2_LIGHTDND | PF2_SHORTAWAY;
@@ -44,7 +44,7 @@ INT_PTR GetCaps(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-INT_PTR GetStatus(WPARAM wParam, LPARAM lParam)
+INT_PTR GetStatus(WPARAM, LPARAM)
 {
 	return ID_STATUS_ONLINE;
 }
@@ -55,7 +55,7 @@ INT_PTR GetName(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 {
 	hInst = hinstDLL;
 	return TRUE;
diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp
index 6e16c3a0b0..a4f6c054ea 100644
--- a/plugins/GmailNotifier/src/notify.cpp
+++ b/plugins/GmailNotifier/src/notify.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-int OpenBrowser(WPARAM hContact, LPARAM lParam)
+int OpenBrowser(WPARAM hContact, LPARAM)
 {
 	char *proto = GetContactProto(hContact);
 	if (proto && !mir_strcmp(proto, MODULE_NAME)) {
diff --git a/plugins/GmailNotifier/src/utility.cpp b/plugins/GmailNotifier/src/utility.cpp
index 69ae7536e6..9aa00d8e79 100644
--- a/plugins/GmailNotifier/src/utility.cpp
+++ b/plugins/GmailNotifier/src/utility.cpp
@@ -42,9 +42,12 @@ BOOL GetBrowser(char *str)
 		strKey = strIE;
 	else if (opt.OpenUsePrg == 0)
 		strKey = strDefault;
-	else if (!db_get_s(NULL, MODULE_NAME, "OpenUsePrgPath", &dbv)) {
-		mir_strcpy(str, dbv.pszVal);
-		db_free(&dbv);
+	else {
+		if (!db_get_s(NULL, MODULE_NAME, "OpenUsePrgPath", &dbv)) {
+			mir_strcpy(str, dbv.pszVal);
+			db_free(&dbv);
+		}
+		else *str = 0;
 		return FALSE;
 	}