Fixed error when no arguments are supplied on command line

grahamrow · May 15, 2014 · ed0697d · ed0697d
1 parent a30dd88
commit ed0697d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/source/aboutdialog.ui b/source/aboutdialog.ui
@@ -42,7 +42,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;&lt;a href=&quot;grahamrow.github.io/Muview2&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0c3d5e;&quot;&gt;Muview2&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ffffff;&quot;&gt; is written in C++ using OpenGL and Qt 5&lt;br/&gt;Graham Rowlands&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic; color:#ffffff;&quot;&gt;Version 2.1 - April 2014&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;right&quot;&gt;&lt;span style=&quot; color:#ffffff;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;right&quot;&gt;&lt;a href=&quot;grahamrow.github.io/Muview2&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0c3d5e;&quot;&gt;Muview2&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; color:#ffffff;&quot;&gt; is written in C++ using OpenGL and Qt 5&lt;br/&gt;Graham Rowlands&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic; color:#ffffff;&quot;&gt;Version 2.1.1 - May 2014&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;right&quot;&gt;&lt;span style=&quot; color:#ffffff;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="wordWrap">
     <bool>true</bool>

diff --git a/source/main.cpp b/source/main.cpp
@@ -9,7 +9,7 @@ int main( int argc, char* argv[] )
 
     // Parse command line arguments
     QApplication::setApplicationName("Muview");
-    QApplication::setApplicationVersion("2.0b4");
+    QApplication::setApplicationVersion("2.1.1");
     app.setStyle(QStyleFactory::create("GTK+"));
 
     Window w( app.arguments() );

diff --git a/source/window.cpp b/source/window.cpp
@@ -145,7 +145,7 @@ Window::Window(QStringList arguments) :
     ui->xSlider->setValue(345 * 1600);
     ui->ySlider->setValue(0   * 1600);
     ui->zSlider->setValue(0   * 1600);
-    setWindowTitle(tr("MuView 2.1"));
+    setWindowTitle(tr("MuView 2.1.1"));
 
     // Data, don't connect until we are ready (probably still not ready here)...
     connect(ui->animSlider, SIGNAL(valueChanged(int)), this, SLOT(updateDisplayData(int)));
@@ -156,7 +156,7 @@ Window::Window(QStringList arguments) :
     }
 
     // Otherwise we load files and directories
-    if (watchDir == "") {
+    if (watchDir == "" && fileargs.length() > 0) {
         foreach (QString item, fileargs) {
             QFileInfo info(item);
             if (!info.exists()) {