Skip to content

Commit 414978c

Browse files
committed
v1.2.9 prerelease stuff
1 parent 609e922 commit 414978c

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MIT License
22

33
Copyright (c) 2010-2014 syd & poopisan
4-
Copyright (c) 2014-2020 Martin Bórik <mborik@users.sourceforge.net>
4+
Copyright (c) 2014-2022 Martin Bórik <martin@borik.net>
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

arm/shell/menu.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,22 @@ void InitScreen(const char *title)
119119
DrawAttr8(0, 20, 0002, 32);
120120
DrawLine(20, 3);
121121
DrawLine(20, 5);
122+
123+
DrawStrAttr(8, 21, "Ctrl+S - save changes to `speccy2010.ini'", 0102, 41);
122124
}
123125
//---------------------------------------------------------------------------------------
124126
void SaveConfigDialog()
125127
{
128+
if (!specConfig.modified)
129+
return;
130+
126131
ScreenPush();
127-
Shell_ProgressBar("speccy2010.ini", "Saving config...", 0126);
132+
Shell_ProgressBar("speccy2010.ini", "Saving config...", 0150);
128133

129134
SaveConfig();
130135
specConfig.modified = false;
131136

132-
Shell_UpdateProgress(1.0f, 0126);
137+
Shell_UpdateProgress(1.0f, 0150);
133138
DelayMs(500);
134139

135140
int timeout = 500;
@@ -352,12 +357,11 @@ void Shell_Menu(const char *title, CMenuItem *menu, int menuSize)
352357
}
353358

354359
if (firstTimeSaveConfigWarning && specConfig.modified) {
355-
if (Shell_MessageBox("speccy2010.ini", "Config changed. Save?", "(use Ctrl+S in menu)", "", MB_YESNO, 0050, 0115)) {
360+
if (Shell_MessageBox("speccy2010.ini", "Config changed. Save?", "", "", MB_YESNO, 0050, 0115)) {
356361
SaveConfigDialog();
357362
}
358363

359364
firstTimeSaveConfigWarning = false;
360-
specConfig.modified = false;
361365
}
362366

363367
SystemBus_Write(0xc00021, 0); // Enable Video

0 commit comments

Comments
 (0)