Made gui option save config override dontsave option. Fixed bug #13.
This commit is contained in:
@@ -130,6 +130,8 @@ extern unsigned char soundon;
|
||||
extern unsigned char spcon;
|
||||
extern unsigned char vsyncon;
|
||||
|
||||
extern unsigned char savecfgforce;
|
||||
|
||||
//extern void Open_File();
|
||||
extern unsigned int ZFileRead();
|
||||
extern unsigned int ZOpenMode;
|
||||
@@ -369,7 +371,7 @@ void DOScreatenewcfg()
|
||||
char buffer[4096];
|
||||
FILE *fp = 0;
|
||||
|
||||
if (cfgdontsave == 1)
|
||||
if (cfgdontsave && !savecfgforce)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2206,7 +2206,7 @@ GUITryMenuItem: ; Defines which menu item calls what window
|
||||
jne .nomovie
|
||||
mov byte[MovieRecordWinVal],0
|
||||
.nomovie
|
||||
GUICheckMenuItem 16, 3
|
||||
GUICheckMenuItem 16, 3 ; Save Config
|
||||
cmp byte[GUIcrowpos],4
|
||||
jne .nosavestuff
|
||||
|
||||
@@ -2214,8 +2214,11 @@ GUITryMenuItem: ; Defines which menu item calls what window
|
||||
mov dl,[InitDrive]
|
||||
mov ebx,InitDir
|
||||
call Change_Dir
|
||||
|
||||
mov byte[savecfgforce],1
|
||||
call createnewcfg
|
||||
call GUISaveVars
|
||||
mov byte[savecfgforce],0
|
||||
|
||||
call Makemode7Table
|
||||
mov dword[GUICMessage],.message1
|
||||
@@ -2231,6 +2234,7 @@ GUITryMenuItem: ; Defines which menu item calls what window
|
||||
|
||||
SECTION .data
|
||||
.message1 db 'CONFIGURATION FILES SAVED.',0
|
||||
NEWSYM savecfgforce, db 0
|
||||
SECTION .text
|
||||
|
||||
DisplayBoxes: ; Displays window when item is clicked
|
||||
|
||||
@@ -36,7 +36,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
extern unsigned char ComboHeader[23], ComboBlHeader[23], GUIRAdd;
|
||||
extern unsigned char GUIsmallscreenon, ScreenScale, TimeChecker;
|
||||
extern unsigned char GUIScreenScale, ShowTimer, ReCalib, cfgdontsave;
|
||||
extern unsigned char CombinDataGlob[3300];
|
||||
extern unsigned char CombinDataGlob[3300], savecfgforce;
|
||||
extern unsigned int PHnumGUIsave, smallscreenon, SnowTimer, NumSnow;
|
||||
extern unsigned int CalibXmin, CalibXmax, CalibYmin, CalibYmax, NumComboGlob;
|
||||
extern unsigned int CalibXmin209, CalibXmax209, CalibYmin209, CalibYmax209;
|
||||
@@ -109,7 +109,7 @@ void ExecGUISaveVars()
|
||||
|
||||
if (ShowTimer == 1) { TimeChecker = CalcCfgChecksum(); }
|
||||
|
||||
if (!cfgdontsave)
|
||||
if (!cfgdontsave || savecfgforce)
|
||||
{
|
||||
write_cfg_vars(GUIFName);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user