From bc0ec04b8a814bf7ea4f00bd46bc4797de0405c6 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Fri, 30 Nov 2018 17:29:20 -0800 Subject: [PATCH] Fixed regression with rdimport(1) that threw SQL errors when importing into an existing cart. --- ChangeLog | 3 +++ utils/rdimport/rdimport.cpp | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43bc4187..1e71c8cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18091,3 +18091,6 @@ 2018-11-30 Patrick Linstruth * Added text clarifying independent rdpanel(1) panels in Ops Guide and other minor corrections. +2018-11-30 Patrick Linstruth + * Fixed regression with rdimport(1) that threw SQL errors when + importing into an existing cart. diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp index 22f5d2f9..eab50a88 100644 --- a/utils/rdimport/rdimport.cpp +++ b/utils/rdimport/rdimport.cpp @@ -1099,8 +1099,13 @@ MainObject::Result MainObject::ImportFile(const QString &filename, if(import_delete_cuts) { DeleteCuts(import_cart_number); } - cart_created= - RDCart::create(effective_group->name(),RDCart::Audio,&err_msg,*cartnum)!=0; + if (RDCart::exists(*cartnum)) { + cart_created=false; + } + else { + cart_created= + RDCart::create(effective_group->name(),RDCart::Audio,&err_msg,*cartnum)!=0; + } RDCart *cart=new RDCart(*cartnum); int cutnum= cart->addCut(import_format,import_bitrate,import_channels);