Popup:

- wiping out checks for service presence;
- code cleaning

1 files changed, 4 insertions, 11 deletions

diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp
index 387275294a..177dd5a2af 100755
--- a/plugins/Alarms/src/options.cpp
+++ b/plugins/Alarms/src/options.cpp
@@ -941,17 +941,10 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				EnableWindow(GetDlgItem(hwndDlg, IDC_DEL), FALSE);

 			}

 

-			if (ServiceExists(MS_POPUP_ADDPOPUPW)) {

-				CheckDlgButton(hwndDlg, IDC_CHK_POPUPS, temp_options.use_popup_module ? BST_CHECKED : BST_UNCHECKED);

-				if (options.use_popup_module)

-					bChecked = FALSE;

-				else {

-					CheckDlgButton(hwndDlg, IDC_CHK_LOOPSOUND, temp_options.loop_sound ? BST_CHECKED : BST_UNCHECKED);

-					bChecked = TRUE;

-				}

-			}

+			CheckDlgButton(hwndDlg, IDC_CHK_POPUPS, temp_options.use_popup_module ? BST_CHECKED : BST_UNCHECKED);

+			if (options.use_popup_module)

+				bChecked = FALSE;

 			else {

-				EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_POPUPS), FALSE);

 				CheckDlgButton(hwndDlg, IDC_CHK_LOOPSOUND, temp_options.loop_sound ? BST_CHECKED : BST_UNCHECKED);

 				bChecked = TRUE;

 			}

@@ -1179,7 +1172,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			int reminder_period = GetDlgItemInt(hwndDlg, IDC_ED_PERIOD, &translated, FALSE);

 			if (translated) temp_options.reminder_period = reminder_period;

 

-			if (!ServiceExists(MS_POPUP_ADDPOPUPW) || !options.use_popup_module)

+			if (!options.use_popup_module)

 				temp_options.loop_sound = IsDlgButtonChecked(hwndDlg, IDC_CHK_LOOPSOUND) ? true : false;

 

 			options = temp_options;