From 42b8f06e999682aac089e8dd94c37d8dc3e18753 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Wed, 29 Mar 2017 12:52:53 +0200
Subject: [PATCH] Ignore gcode when selected multiple files

CURA-3495
---
 resources/qml/Cura.qml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 871d7fcd40..2515510f82 100755
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -733,20 +733,22 @@ UM.MainWindow
         // look for valid project files
         var projectFileUrlList = [];
         var hasGcode = false;
+        var nonGcodeFileList = [];
         for (var i in fileUrls)
         {
             var endsWithG = /\.g$/;
             var endsWithGcode = /\.gcode$/;
             if (endsWithG.test(fileUrls[i]) || endsWithGcode.test(fileUrls[i]))
             {
-                hasGcode = true;
                 continue;
             }
             else if (CuraApplication.checkIsValidProjectFile(fileUrls[i]))
             {
                 projectFileUrlList.push(fileUrls[i]);
             }
+            nonGcodeFileList.push(fileUrls[i]);
         }
+        hasGcode = nonGcodeFileList.length < fileUrls.length;
 
         // show a warning if selected multiple files together with Gcode
         var hasProjectFile = projectFileUrlList.length > 0;
@@ -755,7 +757,7 @@ UM.MainWindow
         {
             infoMultipleFilesWithGcodeDialog.selectedMultipleFiles = selectedMultipleFiles;
             infoMultipleFilesWithGcodeDialog.hasProjectFile = hasProjectFile;
-            infoMultipleFilesWithGcodeDialog.fileUrls = fileUrls.slice();
+            infoMultipleFilesWithGcodeDialog.fileUrls = nonGcodeFileList.slice();
             infoMultipleFilesWithGcodeDialog.projectFileUrlList = projectFileUrlList.slice();
             infoMultipleFilesWithGcodeDialog.open();
         }