From 14872cad14bca3a47d1255d4a7ef016b8d7efdf6 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Sun, 15 Jul 2018 09:36:27 +0200 Subject: [PATCH] prevent scene names being cleared on scene launch --- src/avtk/clipselector.cxx | 3 --- src/eventhandlergui.cxx | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/avtk/clipselector.cxx b/src/avtk/clipselector.cxx index 5b6fccb..394ab6c 100644 --- a/src/avtk/clipselector.cxx +++ b/src/avtk/clipselector.cxx @@ -72,9 +72,6 @@ void ClipSelector::setState( int clipNum, GridLogic::State s ) //cout << "ClipSelector::setState() t = " << ID << " clipNum = " << clipNum << " state = " << s << endl; #endif clips[clipNum].setState( s ); - if ( s == GridLogic::STATE_EMPTY ) { - clips[clipNum].setName(""); - } redraw(); } diff --git a/src/eventhandlergui.cxx b/src/eventhandlergui.cxx index e0c836f..952e3cb 100644 --- a/src/eventhandlergui.cxx +++ b/src/eventhandlergui.cxx @@ -249,6 +249,9 @@ void handleGuiEvents() gui->getTrack(ev.track)->getClipSelector()->setState( ev.scene, ev.state ); if ( ev.state == GridLogic::STATE_RECORDING ) gui->getTrack(ev.track)->getRadialStatus()->recording( true ); + else if ( ev.state == GridLogic::STATE_EMPTY ) + // reset clip name if clip gets cleared + gui->getTrack(ev.track)->getClipSelector()->clips[ ev.scene ].setName(""); else gui->getTrack(ev.track)->getRadialStatus()->recording( false ); }