Merge pull request #4 from oviradoi/fix_crash

Don't decrement the end iterator for empty vector
kobilutil · Feb 25, 2017 · 7e729fc · 7e729fc
2 parents 1ba8981 + fa0d3a1
commit 7e729fc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Explorer/src/FileList/FileList.cpp b/Explorer/src/FileList/FileList.cpp
@@ -2144,7 +2144,8 @@ void FileList::OffsetItr(INT offsetItr, vector<string> & vStrItems)
 
 void FileList::UpdateToolBarElements(void)
 {
-	_pToolBar->enable(_idRedo, _itrPos != _vDirStack.end() - 1);
+	bool canRedo = !_vDirStack.empty() && (_itrPos != _vDirStack.end() - 1);
+	_pToolBar->enable(_idRedo, canRedo);
 	_pToolBar->enable(_idUndo, _itrPos != _vDirStack.begin());
 }