Changes in uspace/app/terminal/terminal.c [46a47c0:4c6fd56] in mainline

File:

• uspace/app/terminal/terminal.c (modified) (3 diffs)

uspace/app/terminal/terminal.c

@@ -1022 +1022 @@
         term->srvs.sarg = term;
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &term->srv);
         if (rc != EOK) {
                 printf("Error registering server.\n");
@@ -1033 +1033 @@
             task_get_id());
 
-        rc = loc_service_register(vc, &term->dsid);
+        rc = loc_service_register(term->srv, vc, &term->dsid);
         if (rc != EOK) {
                 printf("Error registering service.\n");
@@ -1063 +1063 @@
         return EOK;
 error:
+        if (term->dsid != 0)
+                loc_service_unregister(term->srv, term->dsid);
+        if (term->srv != NULL)
+                loc_server_unregister(term->srv);
         if (term->window != NULL)
                 ui_window_destroy(term->window);