/[svn]/qsampler/trunk/src/qsamplerMainForm.cpp
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerMainForm.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3358 by capela, Wed Oct 18 08:57:21 2017 UTC revision 3416 by schoenebeck, Tue Feb 6 18:56:33 2018 UTC
# Line 2864  void MainForm::stopServer ( bool bIntera Line 2864  void MainForm::stopServer ( bool bIntera
2864                  }                  }
2865          }          }
2866    
2867            bool bGraceWait = true;
2868    
2869          // And try to stop server.          // And try to stop server.
2870          if (m_pServer && m_bForceServerStop) {          if (m_pServer && m_bForceServerStop) {
2871                  appendMessages(tr("Server is stopping..."));                  appendMessages(tr("Server is stopping..."));
# Line 2874  void MainForm::stopServer ( bool bIntera Line 2876  void MainForm::stopServer ( bool bIntera
2876                  #else                  #else
2877                          // Try softly...                          // Try softly...
2878                          m_pServer->terminate();                          m_pServer->terminate();
2879                            bool bFinished = m_pServer->waitForFinished(QSAMPLER_TIMER_MSECS * 1000);
2880                            if (bFinished) bGraceWait = false;
2881                  #endif                  #endif
2882                  }                  }
2883          }       // Do final processing anyway.          }       // Do final processing anyway.
2884          else processServerExit();          else processServerExit();
2885    
2886          // Give it some time to terminate gracefully and stabilize...          // Give it some time to terminate gracefully and stabilize...
2887          QTime t;          if (bGraceWait) {
2888          t.start();                  QTime t;
2889          while (t.elapsed() < QSAMPLER_TIMER_MSECS)                  t.start();
2890                  QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);                  while (t.elapsed() < QSAMPLER_TIMER_MSECS)
2891                            QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
2892            }
2893  }  }
2894    
2895    
Legend:
Removed from v.3358  
changed lines
  Added in v.3416
  ViewVC Help
Powered by ViewVC