Skip to content

Commit

Permalink
Some minor cleaning up.
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed May 3, 2018
1 parent fe30413 commit 60f8b53
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
13 changes: 11 additions & 2 deletions src/plugins/support/SimulationSupport/src/simulation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ void Simulation::reload()
// Note: we don't need to delete mWorker since it will be done as part of
// its thread being stopped...

stop(false);
doStop(false);

// Retrieve our file details

Expand Down Expand Up @@ -1141,7 +1141,7 @@ bool Simulation::resume()

//==============================================================================

bool Simulation::stop(bool pElapsedTime)
bool Simulation::doStop(bool pElapsedTime)
{
// Stop our worker, if any, and wait for it to be done

Expand All @@ -1160,6 +1160,15 @@ bool Simulation::stop(bool pElapsedTime)

//==============================================================================

bool Simulation::stop()
{
// Stop our worker

return doStop(true);
}

//==============================================================================

bool Simulation::reset()
{
// Reset our data
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/support/SimulationSupport/src/simulation.h
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class SIMULATIONSUPPORT_EXPORT Simulation : public QObject
bool run();
bool pause();
bool resume();
bool stop(bool pElapsedTime = true);
bool stop();

bool reset();

Expand All @@ -288,6 +288,8 @@ class SIMULATIONSUPPORT_EXPORT Simulation : public QObject

bool simulationSettingsOk(bool pEmitSignal = true);

bool doStop(bool pElapsedTime);

signals:
void running(bool pIsResuming);
void paused();
Expand Down

0 comments on commit 60f8b53

Please sign in to comment.