Server-side fixes from DIRECT_MODE testing

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 7 insertions, 6 deletions

diff --git a/src/fruits/cmv/cmv.c b/src/fruits/cmv/cmv.c
index 333588e..965f211 100644
--- a/src/fruits/cmv/cmv.c
+++ b/src/fruits/cmv/cmv.c
@@ -125,7 +125,11 @@ s32 window_system_main(u32 argc, str *argv, void *extra)
     if (SINK_SERVER && al_strscmp(SINK_SERVER, "1") == 0) {
         local = true;
     } else {
+#ifdef CAMU_DIRECT_MODE
+        local = true;
+#else
         local = argc > 1;
+#endif
     }
 #endif
 
@@ -231,13 +235,9 @@ s32 window_system_main(u32 argc, str *argv, void *extra)
     }
 
     if (local) {
-        for (u32 i = 1; i < argc; i++) {
-            struct nn_packet *packet = nn_packet_create();
-            nn_packet_write_str(packet, &argv[i]);
 #ifndef CAMU_SINK_ONLY
-            camu_server_local_add(&c.server, packet);
-#endif
-            nn_packet_free(packet);
+        for (u32 i = 1; i < argc; i++) {
+            camu_server_local_add(&c.server, &argv[i]);
         }
         if (extra) {
             s32 start_index = *(s32 *)extra;
@@ -245,6 +245,7 @@ s32 window_system_main(u32 argc, str *argv, void *extra)
                 camu_server_local_start_at(&c.server, start_index);
             }
         }
+#endif
     }
 
     struct nn_thread thread;