Popup:

- wiping out checks for service presence;
- code cleaning

2 files changed, 1 insertions, 14 deletions

diff --git a/plugins/WhoUsesMyFiles/src/options.cpp b/plugins/WhoUsesMyFiles/src/options.cpp
index 50414b1e37..ffffa5335a 100644
--- a/plugins/WhoUsesMyFiles/src/options.cpp
+++ b/plugins/WhoUsesMyFiles/src/options.cpp
@@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 void ShowThePreview()
 {
-	if (!ServiceExists(MS_POPUP_ADDPOPUPW)) {
-		MessageBox(nullptr, TranslateT("Popup plugin not found!"), TranslateT("Error"), MB_OK | MB_ICONSTOP);
-		return;
-	}
-
 	if (WumfOptions.AlertFolders) {
 		ShowThePopup(nullptr, L"Guest", L"C:\\My Share");
 		Sleep(300);
@@ -108,10 +103,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara
 			SendDlgItemMessage(hwndDlg,IDC_COLOR_BACK,CPM_SETCOLOUR,0,WumfOptions.ColorBack);
 			SendDlgItemMessage(hwndDlg,IDC_COLOR_TEXT,CPM_SETCOLOUR,0,WumfOptions.ColorText);
 		}
-		if ( !ServiceExists(MS_POPUP_ADDPOPUPW)) {
-			DisableDelayOptions(hwndDlg);
-			break;
-		}
+
 		CheckDlgButton(hwndDlg, IDC_DELAY_INF, WumfOptions.DelayInf ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(hwndDlg, IDC_DELAY_DEF, WumfOptions.DelayDef ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(hwndDlg, IDC_DELAY_SET, WumfOptions.DelaySet ? BST_CHECKED : BST_UNCHECKED);
diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
index e393337547..b454001979 100644
--- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
@@ -55,11 +55,6 @@ void LoadOptions()
 	WumfOptions.DelayInf = g_plugin.getByte(DELAY_INF, FALSE);

 	WumfOptions.DelaySet = g_plugin.getByte(DELAY_SET, FALSE);

 	WumfOptions.DelaySec = g_plugin.getByte(DELAY_SEC, 0);

-	if (!ServiceExists(MS_POPUP_ADDPOPUPW)) {

-		WumfOptions.DelayDef = TRUE;

-		WumfOptions.DelaySet = FALSE;

-		WumfOptions.DelayInf = FALSE;

-	}

 	WumfOptions.LogToFile = g_plugin.getByte(LOG_INTO_FILE, FALSE);

 	WumfOptions.LogFolders = g_plugin.getByte(LOG_FOLDER, TRUE);

 	WumfOptions.AlertFolders = g_plugin.getByte(ALERT_FOLDER, TRUE);