From 3cc2dcabb57e16e439d8f02aa85f48149deca058 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Wed, 25 Mar 2015 22:36:49 +0300 Subject: [PATCH 1/2] Added check for empty filename --- mainwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2eb363f..1e33e0c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -30,7 +30,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->btmpspin->installEventFilter(this); recentMenu = new QMenu(this); trayIcon = new QSystemTrayIcon(this); - trayIcon->setIcon(QIcon(":icons/repraptor.png")); + trayIcon->setIcon(QIcon(QPixmap(":icons/repraptor.png"))); trayIconMenu = new QMenu(this); trayIconMenu->addAction(ui->actionOpen); trayIconMenu->addAction(ui->actionExit); @@ -210,6 +210,7 @@ void MainWindow::open() tr("Open GCODE"), home.home().absolutePath(), "GCODE (*.g *.gco *.gcode *.nc)"); + if(filename.isEmpty() || filename.isNull()) return; gfile.setFileName(filename); if(!recentFiles.contains(filename)) { From 70963c8f59c1f6f71ef317f803f8a153e282be92 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Wed, 25 Mar 2015 23:00:05 +0300 Subject: [PATCH 2/2] No need for QPixmap --- mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 1e33e0c..de4cc3b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -30,7 +30,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->btmpspin->installEventFilter(this); recentMenu = new QMenu(this); trayIcon = new QSystemTrayIcon(this); - trayIcon->setIcon(QIcon(QPixmap(":icons/repraptor.png"))); + trayIcon->setIcon(QIcon(":icons/repraptor.png")); trayIconMenu = new QMenu(this); trayIconMenu->addAction(ui->actionOpen); trayIconMenu->addAction(ui->actionExit);