Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4052 in orxonox.OLD for orxonox/branches/guiMerge


Ignore:
Timestamp:
May 5, 2005, 1:17:00 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/guiMerge: gui produces no more segFault right now … this will probably change again

Location:
orxonox/branches/guiMerge/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_exec.cc

    r4051 r4052  
    110110  PRINTF(3)("Config Directory is: %s.\n", this->confDir);
    111111  //! \todo F** Windows-support
     112#ifndef __WIN32__
    112113  mkdir(this->confDir, 0755);
     114#else /* __WiN32__ */
     115  mkdir(this->confDir);
     116#endif /* __WIN32__ */
    113117}
    114118

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_flags.cc

    r4047 r4052  
    6363
    6464  this->flagsLabel->ereaseText();
    65   this->flagsLabel->appendText(progExecutable);
     65  this->flagsLabel->appendText(executable);
    6666  widget->walkThrough(OrxonoxGuiFlags::flagsText, &flagInfo, 0);
    6767  //  flagsLabel->setTitle(flagText);

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_gtk.cc

    r4049 r4052  
    3636extern OrxonoxGuiFlags* flags;
    3737
    38 char* guiExecutable;
    39 char* progExecutable;
     38char* executable;
    4039
    4140/**
    … …  
    4645bool initGUI(int argc, char *argv[])
    4746{
    48   guiExecutable = new char[strlen(argv[0])+1];
    49   strcpy(guiExecutable, argv[0]);
    50   progExecutable = new char[strlen(guiExecutable)-2];
    51   strncpy(progExecutable, guiExecutable, strlen(guiExecutable)-3);
    52   progExecutable[strlen(progExecutable)]= '\0';
     47  executable = new char[strlen(argv[0])+1];
     48  strcpy(executable, argv[0]);
    5349
    5450#ifdef HAVE_GTK2

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_gtk.h

    r4048 r4052  
    4040                 GUI_CHAR_ARRAY = 5};
    4141
    42 extern char* guiExecutable;
    43 extern char* progExecutable;
     42extern char* executable;
    4443
    4544bool initGUI(int argc, char* argv[]);

  • orxonox/branches/guiMerge/src/orxonox.cc

    r4051 r4052  
    364364  orx->start();
    365365 
    366   delete orx;
     366  //  delete orx;
    367367  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
    368368 
Note: See TracChangeset for help on using the changeset viewer.