comparison ui/mainwindow.cpp @ 1276:4523d81eeafe

Merged.
author Emanuel Schuetze <emanuel@intevation.de>
date Mon, 29 Sep 2014 11:08:46 +0200
parents be989e9d49a4 520d8e6f14a4
children 87b3886aca69
comparison
equal deleted inserted replaced
1275:be989e9d49a4 1276:4523d81eeafe
467 if (!updaterProcess->waitForStarted() || 467 if (!updaterProcess->waitForStarted() ||
468 updaterProcess->state() == QProcess::NotRunning) { 468 updaterProcess->state() == QProcess::NotRunning) {
469 qDebug() << "Failed to start process."; 469 qDebug() << "Failed to start process.";
470 } 470 }
471 connect(updaterProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 471 connect(updaterProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
472 this, SLOT(restart())); 472 this, SLOT(updaterFinished(int, QProcess::ExitStatus)));
473 return; 473 return;
474 } 474 }
475 475
476 #endif 476 #endif
477 if (isVisible()) { 477 if (isVisible()) {

http://wald.intevation.org/projects/trustbridge/