From be57c735080d299788213f1c8bed8a5ee62cdf91 Mon Sep 17 00:00:00 2001
From: radolin <radoslav@kolev.info>
Date: Fri, 19 Jun 2020 15:50:54 +0300
Subject: [PATCH] Set name after call to Init_Service_Handlers(), as it calls
 Device_Init() from device.c which overwrites it to SimpleServer (#98)

---
 apps/server/main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/server/main.c b/apps/server/main.c
index a505c62a..9f74c726 100644
--- a/apps/server/main.c
+++ b/apps/server/main.c
@@ -235,9 +235,7 @@ int main(int argc, char *argv[])
         if (argc > 1) {
             Device_Set_Object_Instance_Number(strtol(argv[1], NULL, 0));
         }
-        if (argc > 2) {
-            Device_Object_Name_ANSI_Init(argv[2]);
-        }
+
 #if defined(BAC_UCI)
     }
     ucix_cleanup(ctx);
@@ -252,6 +250,9 @@ int main(int argc, char *argv[])
        in our device bindings list */
     address_init();
     Init_Service_Handlers();
+    if (argc > 2) {
+        Device_Object_Name_ANSI_Init(argv[2]);
+    }
     dlenv_init();
     atexit(datalink_cleanup);
     /* configure the timeout values */