fix(gui): don't crash when navigating back to a file that has been re…

…moved
craftablescience · Feb 26, 2024 · bb4e651 · bb4e651
1 parent ae4955d
commit bb4e651
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/gui/FileViewer.cpp b/src/gui/FileViewer.cpp
@@ -95,15 +95,29 @@ void NavBar::setPath(const QString& newPath) {
 }
 
 void NavBar::navigateBack() {
-	if (this->historyIndex > 0) {
+	auto oldIndex = this->historyIndex;
+	do {
+		if (this->historyIndex == 0) {
+			return;
+		}
 		this->historyIndex--;
+	} while (!this->window->hasEntry(this->history.at(this->historyIndex)));
+
+	if (oldIndex != this->historyIndex) {
 		this->processPathChanged(this->history.at(this->historyIndex), false);
 	}
 }
 
 void NavBar::navigateNext() {
-	if (this->historyIndex < this->history.size() - 1) {
+	auto oldIndex = this->historyIndex;
+	do {
+		if (this->historyIndex == this->history.size() - 1) {
+			return;
+		}
 		this->historyIndex++;
+	} while (!this->window->hasEntry(this->history.at(this->historyIndex)));
+
+	if (oldIndex != this->historyIndex) {
 		this->processPathChanged(this->history.at(this->historyIndex), false);
 	}
 }