Merge branch 'iss90' into develop

Stateford · Oct 11, 2018 · 29f8c4c · 29f8c4c
2 parents c546ca7 + 5fce15b
commit 29f8c4c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Display-Lock/ui.c b/Display-Lock/ui.c
@@ -112,8 +112,6 @@ void mainWindowInit(HWND hDlg, MAIN_WINDOW_CONTROLS *mainWindowControls)
 
     tci.pszText = L"Settings";
     TabCtrl_InsertItem(mainWindowControls->tabCtrl, SETTINGS_VIEW, &tci);
-
-
 }
 
 void windowsButtonStart(WINDOW_VIEW_CONTROLS *windowControls, ARGS *args, volatile BOOL *running, int windowSelection)
@@ -123,13 +121,15 @@ void windowsButtonStart(WINDOW_VIEW_CONTROLS *windowControls, ARGS *args, volati
     startThread(&windowControls->clipThread, cursorLock, (void*)args);
     EnableWindow(windowControls->startButton, FALSE);
     EnableWindow(windowControls->stopButton, TRUE);
+    EnableWindow(windowControls->comboBox, FALSE);
 }
 
 void windowsButtonStop(MENU menu, WINDOW_VIEW_CONTROLS *windowControls)
 {
     *windowControls->runningClip = FALSE;
     EnableWindow(windowControls->startButton, TRUE);
     EnableWindow(windowControls->stopButton, FALSE);
+    EnableWindow(windowControls->comboBox, TRUE);
     menu.closeThread(windowControls->clipThread, windowControls->runningClip);
 }