[Kde-imaging] extragear/libs/kipi-plugins/mpegencoder

[Angelo Naselli]

SVN commit 612297 by anaselli:

If users press cancel there's no need to tell them again they're using "Default"...
  
CCMAIL: <kde-imaging at kde.org>


 M  +20 -22    kimg2mpg.cpp  


--- trunk/extragear/libs/kipi-plugins/mpegencoder/kimg2mpg.cpp #612296:612297
@@ -510,37 +510,35 @@
   QString Temp;
   QString OutputFileName, InputAudioFileName;
   bool ResultOk;
- 
-    if (m_ChromaComboBox->currentText() == i18n("Default"))
-    {
-      int Ret= KMessageBox::warningContinueCancel( this, 
-                                            i18n( "Default chroma mode option works only with Mjpegtools version < 1.6.3\n"),
-                                            i18n( "Check your Mjpegtools version" ),
-                                            KStdGuiItem::cont(),
-                                            i18n( "KIPImpegencoderChromaWarning"));
-      if (Ret == KMessageBox::Cancel)
-      {
-        m_Abort = true;
-        reset();
-        return;
-      }
-    }
 
- if (m_Encoding)
-    {
+  if (m_Encoding)
+  {
     int Ret = KMessageBox::questionYesNo(this,
         i18n("Do you really abort this encoding process ?\n\n"
-             "Warning: all work so-far will be lost."));
+            "Warning: all work so-far will be lost."));
     if (Ret == KMessageBox::Yes)
-      {
+    {
       m_Abort = true;
       reset();
-      }
-    return;
     }
+    return;
+  }
 
+  if (m_ChromaComboBox->currentText() == i18n("Default"))
+  {
+     int Ret= KMessageBox::warningContinueCancel( this, 
+                                            i18n( "Default chroma mode option works only with Mjpegtools version < 1.6.3\n"),
+                                            i18n( "Check your Mjpegtools version" ),
+                                            KStdGuiItem::cont(),
+                                            i18n( "KIPImpegencoderChromaWarning"));
+     if (Ret == KMessageBox::Cancel)
+     {
+       m_Abort = true;
+       reset();
+       return;
+     }
+   }
 
-
   // Init. Tmp folder
   KStandardDirs dir;
   m_TmpFolderConfig = dir.saveLocation("tmp", "kipi-mpegencoderplugin-" +