Commit dfdb268e authored by Summer Stapleton's avatar Summer Stapleton Committed by Makayla Shepherd
Browse files

Updated handling of memory leak in Gui.cpp to fix pull request. References #4736

parent 625d9c15

isis/src/base/objs/Gui/Gui.cpp

+11 −7
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ namespace Isis { 
    // needs changing...



    #ifdef Q_OS_LINUX

    if (!XOpenDisplay(NULL)) {

    Display *xDisplay = XOpenDisplay(NULL);

    if (!xDisplay) {

      std::cerr << "cannot connect to X server...\n\n"

          "Do you have an X server running?\n\n"

          "If yes then...\n\n"
@@ -68,6 +69,9 @@ namespace Isis { 


      abort();

    }

    else {

      XCloseDisplay(xDisplay);

    }

    #endif

  }

isis/src/base/objs/Gui/Gui.h

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ namespace Isis { 
   *                         setup. Fixes #4731.

   *  @history 2017-05-19 Marjorie Hahn - Applied font style and font size from the 

   *                         IsisPreferences file. Fixes #198.

   *  @history 2018-01-08 Summer Stapleton - Fixed memory leak involved in the X-forwarding check.

   *                         Fixes #4736.

   */



  class Gui : public QMainWindow {