1 files changed, 14 insertions, 2 deletions

diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp
index 5b484079f9..3b99b2c52c 100644
--- a/rbutil/rbutilqt/talkfile.cpp
+++ b/rbutil/rbutilqt/talkfile.cpp
@@ -96,11 +96,23 @@ bool TalkFileCreator::createTalkFiles(ProgressloggerInterface* logger)
         }
         if(fileInf.isDir())  // if it is a dir
         {
+            // skip entry if folder talking isnt enabled
+            if(m_talkFolders == false) 
+            {
+              it.next();
+              continue;
+            }            
             toSpeak = fileInf.fileName();
             filename = fileInf.absolutePath() + "/_dirname.talk";
         }
         else   // if it is a file
         {
+            // skip entry if file talking isnt enabled
+            if(m_talkFiles == false)
+            {
+               it.next();
+               continue;
+            }
             if(m_stripExtensions)
                 toSpeak = fileInf.baseName();
             else
@@ -181,7 +193,7 @@ bool TalkFileCreator::encode(QString input,QString output)
 }
 
 bool TTSSapi::start()
-{
+{    
     QFileInfo tts(m_TTSexec);
     if(!tts.exists())
         return false;
@@ -244,4 +256,4 @@ bool TTSExes::voice(QString text,QString wavfile)
     QProcess::execute(execstring);
     return true;
 
-}
\ No newline at end of file
+}