summaryrefslogtreecommitdiff
path: root/src/fruits
diff options
context:
space:
mode:
Diffstat (limited to 'src/fruits')
-rw-r--r--src/fruits/cmv/cmv.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 6fe0790..a525377 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -121,19 +121,12 @@ s32 window_system_main(u32 argc, str *argv, void *extra)
camu_ff_common_init();
#endif
- char *home_env = getenv("HOME");
- if (home_env) {
- str color_palette;
- al_str_from(&color_palette, home_env);
- al_str_cat(&color_palette, &al_str_c("/.config/colors.json"));
- camu_color_palette_init(&color_palette);
- al_str_free(&color_palette);
- }
+ s32 ret = EXIT_SUCCESS;
nn_event_loop_init(&c.loop);
u8 type;
- str addr;
+ str addr = al_str_null();
if (local) {
#ifdef NAUNET_ON_WINDOWS
type = NNWT_SOCKET_TCP;
@@ -170,8 +163,6 @@ s32 window_system_main(u32 argc, str *argv, void *extra)
prefs->language.audio = CAMU_LANG_JAPANESE;
prefs->language.subtitles = CAMU_LANG_ENGLISH;
- s32 ret = EXIT_SUCCESS;
-
#ifndef CAMU_SINK_ONLY
if (local) {
camu_server_init(&c.server, &c.loop);
@@ -186,6 +177,15 @@ s32 window_system_main(u32 argc, str *argv, void *extra)
}
#endif
+ char *home_env = getenv("HOME");
+ if (home_env) {
+ str color_palette;
+ al_str_from(&color_palette, home_env);
+ al_str_cat(&color_palette, &al_str_c("/.config/colors.json"));
+ camu_colors_maybe_init(&color_palette);
+ al_str_free(&color_palette);
+ }
+
str window_name;
al_str_from(&window_name, "Sink (");
if (local) {