Of course i messed cancel stuff up.

Universal-Team · Jun 27, 2021 · 4a964f0 · 4a964f0
1 parent 19473c7
commit 4a964f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/source/Common.cpp b/source/Common.cpp
@@ -54,11 +54,13 @@ size_t Common::Numpad(const std::string &Text, const size_t CurVal, const size_t
 	SwkbdButton Ret = swkbdInputText(&State, Input, sizeof(Input));
 	Input[Length] = '\0';
 
+	if (Ret != SWKBD_BUTTON_CONFIRM) return CurVal;
+
 	if (Input[0] < '0' || Input[0] > '9') return CurVal; // Because citra allows you to enter actual characters for dumb reasons.
 	size_t Num = std::min<size_t>(std::stoi(Input), MaxVal);
 
 	if (Num < MinVal) Num = MinVal; // If smaller than MinVal, set to MinVal.
-	return (Ret == SWKBD_BUTTON_CONFIRM ? Num : CurVal);
+	return Num;
 };
 
 std::string Common::Keyboard(const std::string &Text, const std::string &CurStr, const int Length) {

diff --git a/source/Components/Utils/Utils.cpp b/source/Components/Utils/Utils.cpp
@@ -60,7 +60,7 @@ void Utils::JumpTo() {
 
 		const size_t Line = Common::Numpad(Common::GetStr("ENTER_LINE_TO_JUMP"), TextEditor::CurrentLine, 1, UniversalEdit::UE->CurrentFile->GetLines(), Digits);
 
-		if (Line <= UniversalEdit::UE->CurrentFile->GetLines()) {
+		if (Line <= UniversalEdit::UE->CurrentFile->GetLines() && Line > 0) {
 			TextEditor::CursorPos = 0;
 			TextEditor::CurrentLine = Line - 1;
 			TextEditor::JumpScroll();