6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-24 12:30:17 +00:00
Code Issues Projects Releases Wiki Activity

Ensures 'Display' menu is removed if machine is closed.

Browse Source
This commit is contained in:
Thomas Harte 2020-06-26 23:27:14 -04:00
parent a0e534b309
commit 6925a04088
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OSBindings/Qt/mainwindow.cpp
View File

@ -62,7 +62,11 @@ void MainWindow::deleteMachine() {
audioThread.stop();
}
// Release the machine.
machine.reset();
// Remove any machine-specific options.
if(displayMenu) menuBar()->removeAction(displayMenu->menuAction());
}
MainWindow::~MainWindow() {
@ -393,7 +397,7 @@ void MainWindow::launchMachine() {
void MainWindow::addDisplayMenu(const std::string &compositeColour, const std::string &compositeMono, const std::string &svideo, const std::string &rgb) {
// Create a display menu.
QMenu *const displayMenu = menuBar()->addMenu(tr("&Display"));
displayMenu = menuBar()->addMenu(tr("&Display"));
QAction *compositeColourAction = nullptr;
QAction *compositeMonochromeAction = nullptr;

1
OSBindings/Qt/mainwindow.h
View File

@ -100,6 +100,7 @@ class MainWindow : public QMainWindow, public Outputs::Speaker::Speaker::Delegat
void deleteMachine();
QMenu *displayMenu = nullptr;
void addDisplayMenu(const std::string &compositeColour, const std::string &compositeMono, const std::string &svideo, const std::string &rgb);
};