summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main.cpp4
-rw-r--r--qt-ui/mainwindow.cpp5
-rw-r--r--qt-ui/mainwindow.h1
3 files changed, 9 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index c288f68dc..6c5e16928 100644
--- a/main.cpp
+++ b/main.cpp
@@ -69,11 +69,13 @@ int main(int argc, char **argv)
files.push_back(cloudURL);
}
}
-
MainWindow *m = MainWindow::instance();
m->setLoadedWithFiles(!files.isEmpty() || !importedFiles.isEmpty());
m->loadFiles(files);
m->importFiles(importedFiles);
+ // in case something has gone wrong make sure we show the error message
+ m->showError();
+
if (verbose > 0)
print_files();
if (!quit)
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 104dfee04..8f2f7cd23 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -1511,6 +1511,11 @@ NotificationWidget *MainWindow::getNotificationWidget()
return ui.mainErrorMessage;
}
+void MainWindow::showError()
+{
+ getNotificationWidget()->showNotification(get_error_string(), KMessageWidget::Error);
+}
+
QString MainWindow::displayedFilename(QString fullFilename)
{
QFile f(fullFilename);
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 25c9b3eba..14aa22f0e 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -98,6 +98,7 @@ public:
QUndoStack *undoStack;
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();
+ void showError();
private
slots:
/* file menu action */