Browse Source

Fix a possible crash when setting the session restart style on an

uninitialized client session.


(Old svn revision: 29742)
upstream/xfce4-panel-4.10.1
Nick Schermer 13 years ago
parent
commit
505d903dfa
  1. 2
      NEWS
  2. 8
      panel/panel-app.c

2
NEWS

@ -10,6 +10,8 @@
- Disconnect the icon theme changed signal from a launcher when it
is destroyed to avoid crash when the icon theme changes.
- Fix drawing dots mode of the seperator plugin in a vertical panel (bug #5162).
- Fix a possible crash when setting the session restart style on an
uninitialized client session.
4.6.0

8
panel/panel-app.c

@ -252,7 +252,7 @@ evaluate_run_state (void)
break;
default:
if (panel_app.session_client)
if (panel_app.session_client != NULL)
{
logout_session (panel_app.session_client);
}
@ -272,7 +272,9 @@ evaluate_run_state (void)
{
/* we quit on purpose, update session manager so
* it does not restart the program immediately */
client_session_set_restart_style(panel_app.session_client, SESSION_RESTART_IF_RUNNING);
if (panel_app.session_client != NULL)
client_session_set_restart_style (panel_app.session_client,
SESSION_RESTART_IF_RUNNING);
if (panel_app.save_id)
{
@ -761,7 +763,7 @@ panel_app_run (gchar *client_id)
MARK("end main loop");
/* cleanup */
if (panel_app.session_client)
if (panel_app.session_client != NULL)
client_session_free (panel_app.session_client);
cleanup_panels ();

Loading…
Cancel
Save