Merge branch 'master' into server

ba6e0c28 · nanahira · 57783079 · c3bb05e2 · ba6e0c28 · 4ea8799a
Commit ba6e0c28 authored Oct 02, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

gframe/game.cpp gframe/game.cpp +1 -1

ocgcore ocgcore +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -1518,7 +1518,7 @@ void Game::SaveConfig() {
 	FILE* fp = fopen("system_user.conf", "w");
 #endif //YGOPRO_COMPAT_MYCARD
 	fprintf(fp, "#config file\n#nickname & gamename should be less than 20 characters\n");
-	char linebuf[512];
+	char linebuf[256];
 	fprintf(fp, "use_d3d = %d\n", gameConf.use_d3d ? 1 : 0);
 	fprintf(fp, "use_image_scale = %d\n", gameConf.use_image_scale ? 1 : 0);
 	fprintf(fp, "pro_version = %d\n", PRO_VERSION);

--- a/ocgcore @ 4ea8799a
+++ b/ocgcore @ 4ea8799a
-Subproject commit 9cc9bb5c2fbea7423952ee0e49befbe6ddadb0a7
+Subproject commit 4ea8799a7099808253a9cfe002c114ccdf868781