UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 16:57:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-17 17:10:32 +01:00
parent 2172eaa7a4 269305c68f
commit 5b2f33c80a
109 changed files with 340 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/code/console_controller.cpp
View File

@@ -163,6 +163,7 @@ const char * ConsoleController::inputText(const char * prompt) {
}
void ConsoleController::viewWillAppear() {
ViewController::viewWillAppear();
loadPythonEnvironment();
if (m_importScriptsWhenViewAppears) {
m_importScriptsWhenViewAppears = false;
@@ -322,6 +323,7 @@ bool ConsoleController::textFieldDidFinishEditing(TextField * textField, const c
m_inputRunLoopActive = false;
return false;
}
telemetryReportEvent("Console", text);
runAndPrintForCommand(text);
if (!sandboxIsDisplayed()) {
m_selectableTableView.reloadData();