From 9c67e1cebf07af9d9f1ab338dbac93de20675e5c Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Thu, 22 Aug 2013 02:25:58 +0100 Subject: [PATCH] -Fixed issue with Cancel button of LoadSample --- src/avtk/avtk_clip_selector.h | 2 +- src/gclipselectoraction.hxx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/avtk/avtk_clip_selector.h b/src/avtk/avtk_clip_selector.h index 9d8e897..d242956 100644 --- a/src/avtk/avtk_clip_selector.h +++ b/src/avtk/avtk_clip_selector.h @@ -342,7 +342,7 @@ class ClipSelector : public Fl_Button else if ( strcmp(m->label(), "Load") == 0 ) { clipSelectorLoad( ID, clipNum ); - loadClip( clipNum, "---" ); + //loadClip( clipNum, "---" ); } else if ( strcmp(m->label(), "1") == 0 ) { EventLooperLoopLength e = EventLooperLoopLength(ID, clipNum ,1); diff --git a/src/gclipselectoraction.hxx b/src/gclipselectoraction.hxx index 4c2aba4..282165e 100644 --- a/src/gclipselectoraction.hxx +++ b/src/gclipselectoraction.hxx @@ -33,6 +33,10 @@ static string choose_file() static void clipSelectorLoad(int track, int scene) { string filePathName = choose_file(); + + if ( strcmp( filePathName.c_str(), "" ) == 0 ) + return; + AudioBuffer* ab = Worker::loadSample( filePathName ); EventLooperLoad e = EventLooperLoad( track, scene, ab ); writeToDspRingbuffer( &e );