Merge remote-tracking branch 'origin/master' into numpad_arrows

# Conflicts:
#	terminal-view/src/main/java/com/termux/view/TerminalView.java
This commit is contained in:
rakslice
2021-01-17 14:57:47 -08:00
3 changed files with 12 additions and 3 deletions

View File

@@ -1548,7 +1548,7 @@ public final class TerminalView extends View {
};
propsFile = new File(possiblePropLocations[0]);
int i = 1;
int i = 0;
while (!propsFile.exists() && i < possiblePropLocations.length) {
propsFile = new File(possiblePropLocations[i]);
i += 1;