record_loader fix

* test for existence of dialog before trying to access it!
pull/1/head
David Freese 2013-07-03 15:29:14 -05:00
rodzic 982f335767
commit 07f9cb8e5f
5 zmienionych plików z 9 dodań i 8 usunięć

Wyświetl plik

@ -2,7 +2,6 @@
#include "record_browse.h" #include "record_browse.h"
#include <config.h> #include <config.h>
Fl_Double_Window *dlgRecordLoader;
Fl_Group *tabDataFiles=(Fl_Group *)0; Fl_Group *tabDataFiles=(Fl_Group *)0;

Wyświetl plik

@ -2,7 +2,7 @@
version 1.0302 version 1.0302
header_name {.h} header_name {.h}
code_name {.cxx} code_name {.cxx}
decl {\#include <config.h>} {selected private local decl {\#include <config.h>} {private local
} }
decl {\#include "record_loader_gui.h"} {public global decl {\#include "record_loader_gui.h"} {public global
@ -11,14 +11,11 @@ decl {\#include "record_loader_gui.h"} {public global
decl {\#include <FL/Fl_Double_Window.H>} {public local decl {\#include <FL/Fl_Double_Window.H>} {public local
} }
decl {Fl_Double_Window *dlgRecordLoader;} {public local
}
Function {make_record_loader_window()} {open Function {make_record_loader_window()} {open
} { } {
Fl_Window {} { Fl_Window {} {
label {Data files sources} open label {Data files sources} open
tooltip {Data files update} xywh {550 108 540 280} type Double resizable visible tooltip {Data files update} xywh {614 112 540 280} type Double resizable visible
} { } {
Fl_Group tabDataFiles {open Fl_Group tabDataFiles {open
tooltip {Tabular data sources} xywh {5 25 570 275} resizable tooltip {Tabular data sources} xywh {5 25 570 275} resizable

Wyświetl plik

@ -50,6 +50,8 @@ extern Fl_Double_Window *fl_digi_main;
extern Fl_Double_Window *scopeview; extern Fl_Double_Window *scopeview;
//extern Fl_Double_Window *opBrowserView; //extern Fl_Double_Window *opBrowserView;
extern Fl_Double_Window *dlgRecordLoader;
extern bool NBEMSapps_dir; extern bool NBEMSapps_dir;
extern FTextRX *ReceiveText; extern FTextRX *ReceiveText;

Wyświetl plik

@ -5,7 +5,6 @@
#include <FL/Fl.H> #include <FL/Fl.H>
#include "record_loader_gui.h" #include "record_loader_gui.h"
#include <FL/Fl_Double_Window.H> #include <FL/Fl_Double_Window.H>
extern Fl_Double_Window *dlgRecordLoader;
#include <FL/Fl_Double_Window.H> #include <FL/Fl_Double_Window.H>
#include <FL/Fl_Group.H> #include <FL/Fl_Group.H>
extern Fl_Group *tabDataFiles; extern Fl_Group *tabDataFiles;

Wyświetl plik

@ -45,10 +45,13 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "FL/Fl_Double_Window.H"
#include "FL/Fl_Output.H" #include "FL/Fl_Output.H"
#include "FL/fl_ask.H" #include "FL/fl_ask.H"
#include "FL/Fl_Check_Button.H" #include "FL/Fl_Check_Button.H"
Fl_Double_Window *dlgRecordLoader = (Fl_Double_Window *)0;
/// Loads a file and stores it for later lookup. /// Loads a file and stores it for later lookup.
int RecordLoaderInterface::LoadAndRegister() int RecordLoaderInterface::LoadAndRegister()
{ {
@ -128,7 +131,8 @@ struct Row
const std::string strnam = m_itf->base_filename(); const std::string strnam = m_itf->base_filename();
m_url->tooltip( strurl ); m_url->tooltip( strurl );
} }
dlgRecordLoader->damage(); if (dlgRecordLoader)
dlgRecordLoader->damage();
return isGood ; return isGood ;
} }
}; };