Index: src/ch/ch.cpp
===================================================================
diff -u -r3921d82d9605d98b2281f3f42d9f9c8385b89a3e -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af
--- src/ch/ch.cpp	(.../ch.cpp)	(revision 3921d82d9605d98b2281f3f42d9f9c8385b89a3e)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af)
@@ -130,7 +130,7 @@
 	return tCfg;
 }
 
-int MsgBox(UINT uiID, UINT nType, UINT nIDHelp)
+int CCopyHandlerApp::MsgBox(UINT uiID, UINT nType, UINT nIDHelp)
 {
 	return AfxMessageBox(GetResManager().LoadString(uiID), nType, nIDHelp);
 }
@@ -368,12 +368,10 @@
 
 			return FALSE;
 		}
-		else
-		{
-			LOG_WARNING(m_spLog) << _T("Other instance of Copy Handler is already running. Exiting.");
-			MsgBox(IDS_ONECOPY_STRING, MB_OK | MB_ICONWARNING);
-			return FALSE;
-		}
+
+		LOG_WARNING(m_spLog) << _T("Other instance of Copy Handler is already running. Exiting.");
+		MsgBox(IDS_ONECOPY_STRING, MB_OK | MB_ICONWARNING);
+		return FALSE;
 	}
 
 	// ================================= Common controls ========================================
@@ -704,8 +702,8 @@
 		strAdd += pszFile;
 		return ::HtmlHelp(hwndCaller, strAdd, uCommand, dwData);
 	}
-	else
-		return ::HtmlHelp(hwndCaller, pszPath, uCommand, dwData);
+
+	return ::HtmlHelp(hwndCaller, pszPath, uCommand, dwData);
 }
 
 void CCopyHandlerApp::HtmlHelp(DWORD_PTR dwData, UINT nCmd)