salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

You can now quit the application while an operation is in progress without

Browse Source 
rashing.
This commit is contained in:
David Given
2022-09-03 15:33:09 +02:00
parent aed6a6f142
commit 372af03d9e
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/logger.h
View File

@@ -14,7 +14,8 @@ struct ErrorLogMessage
};
struct EmergencyStopMessage
{};
{
};
struct BeginSpeedOperationLogMessage
{
@@ -76,7 +77,7 @@ class TrackFlux;
typedef std::variant<std::string,
ErrorLogMessage,
EmergencyStopMessage,
EmergencyStopMessage,
TrackReadLogMessage,
DiskReadLogMessage,
BeginSpeedOperationLogMessage,

36
src/gui/mainwindow.cc
View File

@@ -72,6 +72,13 @@ public:
{
UpdateState();
});
Bind(wxEVT_CLOSE_WINDOW, &MainWindow::OnClose, this);
_exitTimer.Bind(wxEVT_TIMER,
[this](auto&)
{
wxCommandEvent e;
OnExit(e);
});
menuBar->Bind(
wxEVT_MENU, &MainWindow::OnAboutMenuItem, this, wxID_ABOUT);
@@ -133,7 +140,25 @@ public:
void OnExit(wxCommandEvent& event)
{
Close(true);
if (wxGetApp().IsWorkerThreadRunning())
{
emergencyStop = true;
/* We need to wait for the worker thread to exit before we can
* continue to shut down. */
_exitTimer.StartOnce(100);
}
else
Destroy();
}
void OnClose(wxCloseEvent& event)
{
event.Veto();
wxCommandEvent e;
OnExit(e);
}
void OnAboutMenuItem(wxCommandEvent& event)
@@ -483,8 +508,8 @@ public:
[&](const EmergencyStopMessage& m)
{
_statusBar->SetLeftLabel("Emergency stop!");
_statusBar->HideProgressBar();
_statusBar->SetRightLabel("");
_statusBar->HideProgressBar();
_statusBar->SetRightLabel("");
_state = _errorState;
UpdateState();
},
@@ -494,8 +519,8 @@ public:
{
_statusBar->SetLeftLabel(m.message);
wxMessageBox(m.message, "Error", wxOK | wxICON_ERROR);
_statusBar->HideProgressBar();
_statusBar->SetRightLabel("");
_statusBar->HideProgressBar();
_statusBar->SetRightLabel("");
_state = _errorState;
UpdateState();
},
@@ -774,6 +799,7 @@ private:
bool _dontSaveConfig = false;
std::shared_ptr<const DiskFlux> _currentDisk;
CustomStatusBar* _statusBar;
wxTimer _exitTimer;
};
wxWindow* FluxEngineApp::CreateMainWindow()