Fixed possible wrong index usage

OneMoreGres · Oct 17, 2018 · 4109968 · 4109968
1 parent bab4d63
commit 4109968
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/TranslatorHelper.cpp b/TranslatorHelper.cpp
@@ -61,6 +61,9 @@ void TranslatorHelper::loadScripts () {
 void TranslatorHelper::newItem (bool forceRotate) {
   triesLeft_ = scripts_.size ();
   currentIndex_ = forceRotate ? currentIndex_ + 1 : 0;
+  if (currentIndex_ >= scripts_.size ()) {
+    currentIndex_ = 0;
+  }
 }
 
 QString TranslatorHelper::nextScript () {
@@ -74,7 +77,10 @@ QString TranslatorHelper::nextScript () {
 }
 
 QString TranslatorHelper::currentScript () const {
-  return (triesLeft_ > 0 ? scripts_.at (currentIndex_) : QString ());
+  if (triesLeft_ > 0 && currentIndex_ < scripts_.size ()) {
+    return scripts_.at (currentIndex_);
+  }
+  return QString ();
 }
 
 bool TranslatorHelper::gotScripts () const {