From 414978cdaf3e27852d47e9f3d5211503b17c6a2f Mon Sep 17 00:00:00 2001 From: mborik128 Date: Thu, 10 Feb 2022 18:53:41 +0100 Subject: [PATCH] v1.2.9 prerelease stuff --- LICENSE | 2 +- arm/shell/menu.cpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index f72903d..7953873 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ MIT License Copyright (c) 2010-2014 syd & poopisan -Copyright (c) 2014-2020 Martin Bórik +Copyright (c) 2014-2022 Martin Bórik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/arm/shell/menu.cpp b/arm/shell/menu.cpp index 38dd96c..7b94556 100644 --- a/arm/shell/menu.cpp +++ b/arm/shell/menu.cpp @@ -119,17 +119,22 @@ void InitScreen(const char *title) DrawAttr8(0, 20, 0002, 32); DrawLine(20, 3); DrawLine(20, 5); + + DrawStrAttr(8, 21, "Ctrl+S - save changes to `speccy2010.ini'", 0102, 41); } //--------------------------------------------------------------------------------------- void SaveConfigDialog() { + if (!specConfig.modified) + return; + ScreenPush(); - Shell_ProgressBar("speccy2010.ini", "Saving config...", 0126); + Shell_ProgressBar("speccy2010.ini", "Saving config...", 0150); SaveConfig(); specConfig.modified = false; - Shell_UpdateProgress(1.0f, 0126); + Shell_UpdateProgress(1.0f, 0150); DelayMs(500); int timeout = 500; @@ -352,12 +357,11 @@ void Shell_Menu(const char *title, CMenuItem *menu, int menuSize) } if (firstTimeSaveConfigWarning && specConfig.modified) { - if (Shell_MessageBox("speccy2010.ini", "Config changed. Save?", "(use Ctrl+S in menu)", "", MB_YESNO, 0050, 0115)) { + if (Shell_MessageBox("speccy2010.ini", "Config changed. Save?", "", "", MB_YESNO, 0050, 0115)) { SaveConfigDialog(); } firstTimeSaveConfigWarning = false; - specConfig.modified = false; } SystemBus_Write(0xc00021, 0); // Enable Video