From 4543b5437803c5f174597902f5198e97fa9fec74 Mon Sep 17 00:00:00 2001
From: Elias <i@kelteseth.net>
Date: Thu, 25 Jul 2019 19:46:10 +0200
Subject: [PATCH] Change ifs of create state to switch

---
 .../CreateWallpaperVideoImportConvert.qml     | 40 +++++++++----------
 .../CreateWallpaper/CreateWallpaperWizard.qml |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
index 7e2aac65..f73848a0 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
@@ -30,37 +30,39 @@ Item {
         target: screenPlayCreate
 
         onCreateWallpaperStateChanged: {
-            if (state === CreateImportVideo.ConvertingPreviewImageFinished) {
+
+            switch (state) {
+            case CreateImportVideo.ConvertingPreviewImageFinished:
                 imgPreview.source = "file:///" + screenPlayCreate.workingDir + "/preview.png"
                 imgPreview.visible = true
                 txtConvert.text = qsTr("Converting Video preview mp4")
-            }
-
-            if (state === CreateImportVideo.ConvertingPreviewVideo) {
+                break
+            case CreateImportVideo.ConvertingPreviewVideo:
                 txtConvert.text = qsTr("Generating preview video...")
-            }
-
-            if (state === CreateImportVideo.ConvertingPreviewGif) {
+                break
+            case CreateImportVideo.ConvertingPreviewGif:
                 txtConvert.text = qsTr("Generating preview gif...")
-            }
-
-            if (state === CreateImportVideo.ConvertingPreviewGifFinished) {
+                break
+            case CreateImportVideo.ConvertingPreviewGifFinished:
                 imgPreview.source = "file:///" + screenPlayCreate.workingDir + "/preview.gif"
                 imgPreview.visible = true
                 imgPreview.playing = true
-            }
-            if (state === CreateImportVideo.ConvertingAudio) {
+                break
+            case CreateImportVideo.ConvertingAudio:
                 txtConvert.text = qsTr("Converting Audio...")
-            }
-            if (state === CreateImportVideo.ConvertingVideo) {
+                break
+            case CreateImportVideo.ConvertingVideo:
                 txtConvert.text = qsTr("Converting Video...")
-            }
-
-            if (state === CreateImportVideo.Finished) {
+                break
+            case CreateImportVideo.ConvertingVideoError:
+                txtConvert.text = qsTr("Converting Video ERROR!")
+                break
+            case CreateImportVideo.Finished:
                 txtConvert.text = ""
                 conversionFinishedSuccessful = true
                 busyIndicator.running = false
                 wrapperContent.checkCanSave()
+                break
             }
         }
         onProgressChanged: {
@@ -292,10 +294,8 @@ Item {
     }
 }
 
-
-
-
 /*##^## Designer {
     D{i:0;autoSize:true;height:480;width:950}
 }
  ##^##*/
+
diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
index 4e4847b1..82466a2f 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
@@ -35,6 +35,7 @@ Item {
         target: screenPlayCreate
         onCreateWallpaperStateChanged: {
             if (state === CreateImportVideo.AnalyseVideoError || state
+                    === CreateImportVideo.ConvertingVideoError || state
                     === CreateImportVideo.ConvertingPreviewGifError || state
                     === CreateImportVideo.ConvertingPreviewImageError || state
                     === CreateImportVideo.ConvertingAudioError || state