daemon: remove misuse of the room_count
it is used to ensure that room dbus object path is unique decrementing it when room is removed does not make sense because removing non-last room will create duplicate object path string
This commit is contained in:
parent
baaf78dfcf
commit
d4fa4a2412
|
@ -1087,7 +1087,6 @@ static void ladish_studio_delete_room(struct dbus_method_call * call_ptr)
|
|||
if (strcmp(ladish_room_get_name(room), name) == 0)
|
||||
{
|
||||
list_del(node_ptr);
|
||||
g_studio.room_count--;
|
||||
emit_room_disappeared(room);
|
||||
|
||||
ladish_room_get_uuid(room, room_uuid);
|
||||
|
@ -1116,13 +1115,9 @@ void studio_remove_all_rooms(void)
|
|||
node_ptr = g_studio.rooms.next;
|
||||
list_del(node_ptr);
|
||||
room = ladish_room_from_list_node(node_ptr);
|
||||
ASSERT(g_studio.room_count > 0);
|
||||
g_studio.room_count--;
|
||||
emit_room_disappeared(room);
|
||||
ladish_room_destroy(room);
|
||||
}
|
||||
|
||||
ASSERT(g_studio.room_count == 0);
|
||||
}
|
||||
|
||||
METHOD_ARGS_BEGIN(GetName, "Get studio name")
|
||||
|
|
Loading…
Reference in New Issue