The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2025-01-10 13:29:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Crash if log file is missing + Crash on random interrupt

Browse Source
This commit is contained in:
◱ PixelyIon 2019-07-25 02:31:31 +05:30
parent 696ebde527
commit 3bdbe41c13
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/cpp/switch/os/os.cpp
View File

@ -27,7 +27,7 @@ namespace lightSwitch::os {
SvcHandler(svcId, state); SvcHandler(svcId, state);
} else { } else {
state.logger->write(Logger::ERROR, "An unhandled interrupt has occurred: {}", int_no); state.logger->write(Logger::ERROR, "An unhandled interrupt has occurred: {}", int_no);
exit(int_no); state.cpu->StopExecution();
} }
} catch (exception &e) { } catch (exception &e) {
state.logger->write(Logger::WARN, "An exception occurred during an interrupt: {}", e.what()); state.logger->write(Logger::WARN, "An exception occurred during an interrupt: {}", e.what());

10
app/src/main/java/emu/lightswitch/lightswitch/LogActivity.java
View File

@ -41,11 +41,6 @@ public class LogActivity extends AppCompatActivity {
try { try {
InputStream inputStream = new FileInputStream(log_file); InputStream inputStream = new FileInputStream(log_file);
reader = new BufferedReader(new InputStreamReader(inputStream)); reader = new BufferedReader(new InputStreamReader(inputStream));
} catch (FileNotFoundException e) {
Log.w("Logger", "IO Error during access of log file: " + e.getMessage());
Toast.makeText(getApplicationContext(), getString(R.string.file_missing), Toast.LENGTH_LONG).show();
finish();
}
thread = new Thread(new Runnable() { thread = new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -82,6 +77,11 @@ public class LogActivity extends AppCompatActivity {
} }
}); });
thread.start(); thread.start();
} catch (FileNotFoundException e) {
Log.w("Logger", "IO Error during access of log file: " + e.getMessage());
Toast.makeText(getApplicationContext(), getString(R.string.file_missing), Toast.LENGTH_LONG).show();
finish();
}
} }
@Override @Override