From 2641e262b975a2307e625ddca1c80ed1f8e3a7cf Mon Sep 17 00:00:00 2001
From: bluebrother <bluebrother@a1c6a512-1295-4272-9138-f99709370657>
Date: Mon, 23 Jun 2008 20:08:22 +0000
Subject: [PATCH] Explicitly set the dialog's result code for TTS / Encoder
 windows. Fixes an issue where one couldn't close the dialog anymore.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17766 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/encodersgui.cpp |  9 +++++----
 rbutil/rbutilqt/ttsgui.cpp      | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rbutil/rbutilqt/encodersgui.cpp b/rbutil/rbutilqt/encodersgui.cpp
index b363e95e6..8771f4f4a 100644
--- a/rbutil/rbutilqt/encodersgui.cpp
+++ b/rbutil/rbutilqt/encodersgui.cpp
@@ -80,12 +80,12 @@ void EncExesGui::accept(void)
     
     // sync settings
     settings->sync();
-    this->close();
+    this->done(0);
 }
 
 void EncExesGui::reject(void)
 {
-    this->close();
+    this->done(0);
 }
 
 void EncExesGui::reset()
@@ -153,12 +153,12 @@ void EncRbSpeexGui::accept(void)
 
     // sync settings
     settings->sync();
-    this->close();
+    this->done(0);
 }
 
 void EncRbSpeexGui::reject(void)
 {
-    this->close();
+    this->done(0);
 }
 
 void EncRbSpeexGui::reset()
@@ -168,3 +168,4 @@ void EncRbSpeexGui::reset()
     ui.complexity->setValue(defaultComplexity);
     ui.narrowband->setChecked(Qt::Unchecked); 
 }
+
diff --git a/rbutil/rbutilqt/ttsgui.cpp b/rbutil/rbutilqt/ttsgui.cpp
index 3ed2e87f0..68a0566dc 100644
--- a/rbutil/rbutilqt/ttsgui.cpp
+++ b/rbutil/rbutilqt/ttsgui.cpp
@@ -88,18 +88,18 @@ void TTSSapiGui::accept(void)
         settings->setTTSUseSapi4(false);
     // sync settings
     settings->sync();
-    
-    this->close();
+
+    this->done(0);
 }
 
 void TTSSapiGui::reject(void)
 {
-    this->close();
+    this->done(0);
 }
 
 void TTSSapiGui::updateVoices(QString language)
 {
-    QStringList Voices = m_sapi->getVoiceList(language);  
+    QStringList Voices = m_sapi->getVoiceList(language);
     ui.voicecombo->clear();
     ui.voicecombo->addItems(Voices);    
 
@@ -182,12 +182,12 @@ void TTSExesGui::accept(void)
     // sync settings
     settings->sync();
     
-    this->close();
+    this->done(0);
 }
 
 void TTSExesGui::reject(void)
 {
-    this->close();
+    this->done(0);
 }
 
 
-- 
2.11.4.GIT