mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-04-21 21:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflicts with #207

Browse source
This commit is contained in:
Nathan-MV 2024-09-29 11:34:55 +00:00
parent d4bf2123a9
commit f27018912c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
binding/binding-mri.cpp
View file

@ -693,7 +693,7 @@ RB_METHOD_GUARD(mkxpLaunch) {
} }
RB_METHOD_GUARD_END RB_METHOD_GUARD_END
RB_METHOD(mkxpParseCSV) { RB_METHOD_GUARD(mkxpParseCSV) {
RB_UNUSED_PARAM; RB_UNUSED_PARAM;
VALUE str; VALUE str;
@ -713,11 +713,12 @@ RB_METHOD(mkxpParseCSV) {
rb_ary_push(ret, col); rb_ary_push(ret, col);
} }
} catch (std::exception &e) { } catch (std::exception &e) {
raiseRbExc(Exception(Exception::MKXPError, "Failed to parse CSV: %s", e.what())); throw Exception(Exception::MKXPError, "Failed to parse CSV: %s", e.what());
} }
return ret; return ret;
} }
RB_METHOD_GUARD_END
json5pp::value loadUserSettings() { json5pp::value loadUserSettings() {
json5pp::value ret; json5pp::value ret;