Commit e2e416f8 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into m05218

parents 1c10d7fc 7081aa2a

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

+6 −9
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ namespace Isis { 


      abort();

    }

    else {

      XCloseDisplay(NULL);

    }

    #endif

  }

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

+1 −3
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ 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 {