Conflict resolution.

src/win/win.c

@@ -74,16 +74,16 @@ volatile int	cpu_thread_run = 1;
 
 /* Local data. */
 static HANDLE	thMain;
-static rc_str_t	*lpRCstr2048,
-		*lpRCstr4096,
-		*lpRCstr4352,
-		*lpRCstr4608,
-		*lpRCstr5120,
-		*lpRCstr5376,
-		*lpRCstr5632,
-		*lpRCstr5888,
-		*lpRCstr6144,
-		*lpRCstr7168;
+static rc_str_t	*lpRCstr2048 = NULL,
+		*lpRCstr4096 = NULL,
+		*lpRCstr4352 = NULL,
+		*lpRCstr4608 = NULL,
+		*lpRCstr5120 = NULL,
+		*lpRCstr5376 = NULL,
+		*lpRCstr5632 = NULL,
+		*lpRCstr5888 = NULL,
+		*lpRCstr6144 = NULL,
+		*lpRCstr7168 = NULL;
 static int	vid_api_inited = 0;
 static char	*argbuf;
 static int	first_use = 1;
@@ -139,11 +139,31 @@ win_log(const char *fmt, ...)
 #endif
 
 
+free_string(rc_str_t **str)
+{
+    if (*str != NULL) {
+	free(*str);
+	*str = NULL;
+    }
+}
+
+
 static void
 LoadCommonStrings(void)
 {
     int i;
 
+    free_string(&lpRCstr7168);
+    free_string(&lpRCstr6144);
+    free_string(&lpRCstr5888);
+    free_string(&lpRCstr5632);
+    free_string(&lpRCstr5376);
+    free_string(&lpRCstr5120);
+    free_string(&lpRCstr4608);
+    free_string(&lpRCstr4352);
+    free_string(&lpRCstr4096);
+    free_string(&lpRCstr2048);
+
     lpRCstr2048 = (rc_str_t *)malloc(STR_NUM_2048*sizeof(rc_str_t));
     lpRCstr4096 = (rc_str_t *)malloc(STR_NUM_4096*sizeof(rc_str_t));
     lpRCstr4352 = (rc_str_t *)malloc(STR_NUM_4352*sizeof(rc_str_t));
@@ -221,6 +241,15 @@ size_t c16stombs(char dst[], const uint16_t src[], int len)
 }
 
 
+int
+has_language_changed(int id)
+{
+    LCID lcidNew = MAKELCID(id, dwSubLangID);
+
+    return (lang_id != lcidNew);
+}
+
+
 /* Set (or re-set) the language for the application. */
 void
 set_language(int id)

src/win/win_discord.c

@@ -96,12 +96,24 @@ discord_update_activity(int paused)
 
     activity.timestamps.start = time(NULL);
 
+/* Icon choosing for Discord based on 86Box.rc */
+
 #ifdef RELEASE_BUILD
-    strcpy(activity.assets.large_image, "86box-rb");
+/* Icon by OBattler and laciba96 (green for release builds)*/
+    strcpy(activity.assets.large_image, "86box-green");
+#elif BETA_BUILD
+/* Icon by OBattler and laciba96 (yellow for beta builds done by Jenkins)*/
+    strcpy(activity.assets.large_image, "86box-yellow");
+#elif ALPHA_BUILD
+/* Icon by OBattler and laciba96 (red for alpha builds done by Jenkins)*/
+    strcpy(activity.assets.large_image, "86box-red");
 #else
+/* Icon by OBattler and laciba96 (gray for builds of branches and from the git master)*/
     strcpy(activity.assets.large_image, "86box");
 #endif
 
+/* End of icon choosing */
+
     if (paused)
     {
 	strcpy(activity.assets.small_image, "status-paused");
@@ -147,7 +159,7 @@ discord_init()
 	return;
 
     DiscordCreateParamsSetDefault(&params);
-    params.client_id = 651478134352248832;
+    params.client_id = 906956844956782613;
     params.flags = DiscordCreateFlags_NoRequireDiscord;
 
     result = discord_create(DISCORD_VERSION, &params, &discord_core);

src/win/win_settings.c

@@ -77,6 +77,9 @@
 static int first_cat = 0;
 static int dpi = 96;
 
+/* Language */
+static int temp_language;
+
 /* Machine category */
 static int temp_machine_type, temp_machine, temp_cpu, temp_wait_states, temp_fpu, temp_sync;
 static cpu_family_t *temp_cpu_f;
@@ -322,6 +325,9 @@ win_settings_init(void)
 {
     int i = 0;
 
+    /* Language */
+    // TODO: Set temp_language here.
+
     /* Machine category */
     temp_machine_type = machines[machine].type;
     temp_machine = machine;
@@ -447,6 +453,9 @@ win_settings_changed(void)
 {
     int i = 0, j = 0;
 
+    /* Language */
+    // i = i || has_language_changed(temp_language);
+
     /* Machine category */
     i = i || (machine != temp_machine);
     i = i || (cpu_f != temp_cpu_f);
@@ -537,6 +546,9 @@ win_settings_save(void)
 
     pc_reset_hard_close();
 
+    /* Language */
+    // set_language(temp_language);
+
     /* Machine category */
     machine = temp_machine;
     cpu_f = temp_cpu_f;