1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Thu, 2 Feb 2023 14:35:08 +0200
Subject: Handle default player not being in app list
Origin: commit:cbcf22fac5b45ab251ade2e7e993f422f33f926e
Applied-Upstream: yes
---
src/alarm-applet.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/alarm-applet.c b/src/alarm-applet.c
index 647b300..d287850 100644
--- a/src/alarm-applet.c
+++ b/src/alarm-applet.c
@@ -321,15 +321,20 @@ void alarm_applet_apps_load(AlarmApplet* applet)
// Move default app to the top
// First, find it in the list
GList* default_audio_app_item = g_list_find_custom(app_list, default_audio_app, (GCompareFunc)g_app_info_same_executable);
- g_assert(default_audio_app_item != NULL);
- g_object_unref(g_steal_pointer(&default_audio_app));
+ if(default_audio_app_item) {
+ g_object_unref(g_steal_pointer(&default_audio_app));
- // Remove it
- app_list = g_list_remove_link(app_list, default_audio_app_item);
+ // Remove it
+ app_list = g_list_remove_link(app_list, default_audio_app_item);
+
+ // Then, prepend it
+ app_list = g_list_concat(default_audio_app_item, app_list);
+ } else {
+ // It is possible for the default app to not exist in the list. In this case, just prepend it
+ app_list = g_list_prepend(app_list, default_audio_app);
+ }
- // Then, prepend it
- app_list = g_list_concat(default_audio_app_item, app_list);
} else {
g_debug("Could not get default application for %s", app_list_content_type);
}
|
