From 2c095806332acd159785e4f89d5e556c25d48754 Mon Sep 17 00:00:00 2001
From: NeoTheFox <soniczerops@gmail.com>
Date: Sun, 8 Mar 2015 17:54:44 +0300
Subject: [PATCH] Additional checks

---
 mainwindow.cpp | 13 ++++++++-----
 parser.cpp     |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 463d6d7..07fdbb3 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -467,7 +467,9 @@ void MainWindow::on_haltbtn_clicked()
 
 void MainWindow::readSerial()
 {
-    QByteArray data = printer.readLine();
+    if(printer.canReadLine())
+    {
+        QByteArray data = printer.readLine();
     /*
     if(printer.canReadLine())
     {
@@ -554,10 +556,11 @@ void MainWindow::readSerial()
             readingFiles = true; //start reading files from SD
         }
 */
-    emit recievedData(data);
-    if(data.startsWith("ok")) readyRecieve++;
-    else if(data.startsWith("wa")) readyRecieve=1;
-    printMsg(QString(data)); //echo
+        emit recievedData(data);
+        if(data.startsWith("ok")) readyRecieve++;
+        else if(data.startsWith("wa")) readyRecieve=1;
+        printMsg(QString(data)); //echo
+    }
 }
 
 void MainWindow::printMsg(const char* text)
diff --git a/parser.cpp b/parser.cpp
index 5c3bf03..fa756a5 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -117,8 +117,8 @@ void Parser::parse(QByteArray data)
             SDFilesList.clear();
             readingFiles = true; //start reading files from SD
         }
-        else if(data.contains("REPETIER")) emit recievedFirmware(Repetier);
-        else if(data.contains("MARLIN")) emit recievedFirmware(Marlin);
+        //else if(data.contains("REPETIER")) emit recievedFirmware(Repetier);
+        //else if(data.contains("MARLIN")) emit recievedFirmware(Marlin);
     }
 }