fixing #1890
This commit is contained in:
parent
c301eb13ae
commit
8001ebc5fc
|
@ -38,7 +38,6 @@
|
||||||
|
|
||||||
#include "LiveSupport/Widgets/WidgetFactory.h"
|
#include "LiveSupport/Widgets/WidgetFactory.h"
|
||||||
#include "LiveSupport/Widgets/ZebraTreeView.h"
|
#include "LiveSupport/Widgets/ZebraTreeView.h"
|
||||||
#include "SchedulePlaylistWindow.h"
|
|
||||||
|
|
||||||
#include "ScratchpadWindow.h"
|
#include "ScratchpadWindow.h"
|
||||||
|
|
||||||
|
@ -492,14 +491,12 @@ ScratchpadWindow :: onSchedulePlaylist(void) throw ()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: this should be somewhere else; figure out where
|
schedulePlaylistWindow.reset(new SchedulePlaylistWindow(gLiveSupport,
|
||||||
Ptr<SchedulePlaylistWindow>::Ref scheduleWindow;
|
bundle,
|
||||||
scheduleWindow.reset(new SchedulePlaylistWindow(gLiveSupport,
|
0, /* no button */
|
||||||
bundle,
|
playlist));
|
||||||
0, /* no button */
|
|
||||||
playlist));
|
|
||||||
|
|
||||||
Gtk::Main::run(*scheduleWindow);
|
Gtk::Main::run(*schedulePlaylistWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -749,6 +746,9 @@ ScratchpadWindow :: on_hide(void) throw ()
|
||||||
if (exportPlaylistWindow) {
|
if (exportPlaylistWindow) {
|
||||||
exportPlaylistWindow->hide();
|
exportPlaylistWindow->hide();
|
||||||
}
|
}
|
||||||
|
if (schedulePlaylistWindow) {
|
||||||
|
schedulePlaylistWindow->hide();
|
||||||
|
}
|
||||||
|
|
||||||
GuiWindow::on_hide();
|
GuiWindow::on_hide();
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
#include "GuiWindow.h"
|
#include "GuiWindow.h"
|
||||||
#include "ContentsStorable.h"
|
#include "ContentsStorable.h"
|
||||||
#include "ExportPlaylistWindow.h"
|
#include "ExportPlaylistWindow.h"
|
||||||
|
#include "SchedulePlaylistWindow.h"
|
||||||
|
|
||||||
namespace LiveSupport {
|
namespace LiveSupport {
|
||||||
namespace GLiveSupport {
|
namespace GLiveSupport {
|
||||||
|
@ -85,6 +86,11 @@ class ScratchpadWindow : public GuiWindow,
|
||||||
*/
|
*/
|
||||||
Ptr<ExportPlaylistWindow>::Ref exportPlaylistWindow;
|
Ptr<ExportPlaylistWindow>::Ref exportPlaylistWindow;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Schedule Playlist pop-up window.
|
||||||
|
*/
|
||||||
|
Ptr<SchedulePlaylistWindow>::Ref schedulePlaylistWindow;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check whether exactly one row is selected, and if so, set
|
* Check whether exactly one row is selected, and if so, set
|
||||||
* the currentRow variable to point to it.
|
* the currentRow variable to point to it.
|
||||||
|
|
Loading…
Reference in New Issue