Merge branch 'main' into shutter-fix

tecnd · Oct 1, 2021 · 415140c · 415140c
2 parents a220da0 + 039b8d9
commit 415140c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4,904 deletions.
diff --git a/Adwin.c.old b/Adwin.c.old
diff --git a/Adwin.h.old b/Adwin.h.old
diff --git a/GUIDesign.c b/GUIDesign.c
@@ -737,8 +737,6 @@ void BuildUpdateList(double TMatrix[], struct AnalogTableValues AMat[NUMBERANALO
 	// more debug info
 	tstop = clock();
 	timeused = tstop - tstart;
-	t = Start_Process(processnum);
-	tstop = clock();
 	sprintf(buff, "Time to transfer and start ADwin:   %d", timeused);
 
 	GetMenuBarAttribute(menuHandle, MENU_PREFS_STREAM_SETTINGS, ATTR_CHECKED, &StreamSettings);
@@ -2960,9 +2958,9 @@ void CVICALLBACK RESETZERO_CALLBACK(int
 									int menuItem, void *callbackData,
 									int panel)
 {
-	int ischecked = 0;
-	GetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, &ischecked);
-	SetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, abs(ischecked - 1));
+	int checked = 0;
+	GetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, &checked);
+	SetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, abs(checked - 1));
 }
 //***********************************************************************************************
 void SaveLastGuiSettings(void)