From: Nicolas Boichat <nicolas@boichat.ch>
Date: Fri, 24 Sep 2004 10:34:56 +0000 (+0000)
Subject: Fix Solaris crash.
X-Git-Tag: Release-1.35.6~19
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f430cafc2058e9907bc473ff060c172aba9263bb;p=bacula%2Fbacula

Fix Solaris crash.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1611 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/tray-monitor/tray-monitor.c b/bacula/src/tray-monitor/tray-monitor.c
index be1d003ef0..4531d34f5a 100644
--- a/bacula/src/tray-monitor/tray-monitor.c
+++ b/bacula/src/tray-monitor/tray-monitor.c
@@ -150,6 +150,8 @@ int main(int argc, char *argv[])
    working_directory = "/tmp";
    args = get_pool_memory(PM_FNAME);
 
+   gtk_init (&argc, &argv);
+
    while ((ch = getopt(argc, argv, "bc:d:th?f:s:")) != -1) {
       switch (ch) {
       case 'c':                    /* configuration file */
@@ -178,7 +180,7 @@ int main(int argc, char *argv[])
       }  
    }
    argc -= optind;
-   argv += optind;
+   //argv += optind;
 
    if (argc) {
       usage();
@@ -256,8 +258,6 @@ Without that I don't how to get status from the File, Storage or Director Daemon
 This value must be greater or equal to 1 second and less or equal to 10 minutes (read value: %d).\n"), configfile, monitor->RefreshInterval);
    }
    
-   gtk_init (&argc, &argv);
-   
    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_xpm_data(generateXPM(warn, warn));
    // This should be ideally replaced by a completely libpr0n-based icon rendering.
    mTrayIcon = egg_status_icon_new_from_pixbuf(pixbuf);