empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pause the emulator when Disks are swapped.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2018-02-13 20:02:17 +00:00
parent cde7b12555
commit 5659dde498
2 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
source/frontends/qapple/qapple.cpp
View file

@ -147,6 +147,24 @@ int MessageBox(HWND, const char * text, const char * caption, UINT type)
} }
} }
QApple::PauseEmulator::PauseEmulator(QApple * qapple) : myQApple(qapple)
{
myWasRunning = myQApple->actionPause->isEnabled();
if (myWasRunning)
{
myQApple->actionPause->trigger();
}
}
QApple::PauseEmulator::~PauseEmulator()
{
if (myWasRunning)
{
myQApple->actionStart->trigger();
}
}
QApple::QApple(QWidget *parent) : QApple::QApple(QWidget *parent) :
QMainWindow(parent), myTimerID(0), myPreferences(this) QMainWindow(parent), myTimerID(0), myPreferences(this)
{ {
@ -299,15 +317,12 @@ void QApple::on_actionMemory_triggered()
void QApple::on_actionOptions_triggered() void QApple::on_actionOptions_triggered()
{ {
const bool running = actionPause->isEnabled(); // this is to overcome an issue in GNOME where the open file dialog gets lost
if (running) // if the emulator is running
{ // at times it can be found in a separate desktop, or it magically reappears
// this is to overcome an issue in GNOME where the open file dialog gets lost // but often it forces to terminate the emulator
// if the emulator is running PauseEmulator pause(this);
// at times it can be found in a separate desktop, or it magically reappears
// but often it forces to terminate the emulator
actionPause->trigger();
}
const Preferences::Data currentOptions = getCurrentOptions(myGamepad); const Preferences::Data currentOptions = getCurrentOptions(myGamepad);
QSettings settings; // the function will "modify" it QSettings settings; // the function will "modify" it
@ -319,11 +334,6 @@ void QApple::on_actionOptions_triggered()
setNewOptions(currentOptions, newOptions, myGamepad); setNewOptions(currentOptions, newOptions, myGamepad);
} }
if (running)
{
// otherwise we would slow down later
actionStart->trigger();
}
} }
void QApple::on_actionSave_state_triggered() void QApple::on_actionSave_state_triggered()
@ -390,5 +400,8 @@ void QApple::on_actionScreenshot_triggered()
void QApple::on_actionSwap_disks_triggered() void QApple::on_actionSwap_disks_triggered()
{ {
PauseEmulator pause(this);
// this might open a file dialog
DiskDriveSwap(); DiskDriveSwap();
} }

14
source/frontends/qapple/qapple.h
View file

@ -25,6 +25,7 @@ protected:
virtual void timerEvent(QTimerEvent *event); virtual void timerEvent(QTimerEvent *event);
private slots: private slots:
void on_actionStart_triggered(); void on_actionStart_triggered();
void on_actionPause_triggered(); void on_actionPause_triggered();
@ -59,6 +60,19 @@ private slots:
private: private:
// helper class to pause the emulator and restart at the end of the block
class PauseEmulator
{
public:
PauseEmulator(QApple * qapple);
~PauseEmulator();
private:
bool myWasRunning;
QApple * myQApple;
};
void stopTimer(); void stopTimer();
void restartTimeCounters(); void restartTimeCounters();