summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2022-02-04 22:49:28 +0100
committerBastien Nocera <hadess@hadess.net>2022-02-04 22:52:05 +0100
commit4e66a250ebf19963355fde2bb40b45ed2a0b6c57 (patch)
tree1b2ec21b334023e2f6c79d36735d906469940c54 /src
parentb6f918ac3caf0c1c8f66aec1b0428e5bb7c1f574 (diff)
downloadtotem-4e66a250ebf19963355fde2bb40b45ed2a0b6c57.tar.gz
main: Don't hide cursor when switched away from player
If we exited the player with the popups still shown, the timeout to hide the popups would hide the cursor. Remove the timeouts when switching away from the player and don't schedule new timeouts. Closes: #502
Diffstat (limited to 'src')
-rw-r--r--src/totem-object.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/totem-object.c b/src/totem-object.c
index 59d23f3ab..f8aea4ef1 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -1107,6 +1107,7 @@ totem_object_set_main_page (TotemObject *totem,
if (totem_grilo_get_current_page (TOTEM_GRILO (totem->grilo)) == TOTEM_GRILO_PAGE_RECENT)
gtk_widget_show (totem->add_button);
totem_grilo_start (TOTEM_GRILO (totem->grilo));
+ unschedule_hiding_popup (totem);
}
g_object_notify (G_OBJECT (totem), "main-page");
@@ -1911,7 +1912,8 @@ unmark_popup_busy (TotemObject *totem,
g_debug ("Removing popup busy for reason %s", reason);
if (g_hash_table_size (totem->busy_popup_ht) == 0 &&
- gtk_widget_get_opacity (GTK_WIDGET (gtk_builder_get_object (totem->controls, "toolbar"))) != 0.0) {
+ gtk_widget_get_opacity (GTK_WIDGET (gtk_builder_get_object (totem->controls, "toolbar"))) != 0.0 &&
+ g_strcmp0 (gtk_stack_get_visible_child_name (GTK_STACK (totem->stack)), "player") == 0) {
g_debug ("Will hide popup soon");
schedule_hiding_popup (totem);
}