ardour/livetrax
13
0
Fork 0
Code

correct value testing for Stateful thread-private variable controlling ID regeneration

Browse Source
This commit is contained in:
Paul Davis 2015-11-16 21:23:39 -05:00
parent 9694dfc8d2
commit e1dc2d4604
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/pbd/stateful.cc
View File

@ -44,9 +44,9 @@ namespace PBD {
int Stateful::current_state_version = 0; int Stateful::current_state_version = 0;
int Stateful::loading_state_version = 0; int Stateful::loading_state_version = 0;
static void do_not_delete (void*) { } static void regular_delete (void* p) { bool* bp = reinterpret_cast<bool*> (p); delete bp; std::cerr << "Deleted RSSI bool\n"; }
Glib::Threads::Private<bool> Stateful::regenerate_xml_or_string_ids (do_not_delete); Glib::Threads::Private<bool> Stateful::regenerate_xml_or_string_ids (regular_delete);
Stateful::Stateful () Stateful::Stateful ()
: _extra_xml (0) : _extra_xml (0)
@ -385,8 +385,9 @@ bool
Stateful::set_id (const XMLNode& node) Stateful::set_id (const XMLNode& node)
{ {
const XMLProperty* prop; const XMLProperty* prop;
bool* regen = regenerate_xml_or_string_ids.get();
if (regenerate_xml_or_string_ids.get()) { if (regen && *regen) {
reset_id (); reset_id ();
return true; return true;
} }
@ -408,7 +409,9 @@ Stateful::reset_id ()
void void
Stateful::set_id (const string& str) Stateful::set_id (const string& str)
{ {
if (regenerate_xml_or_string_ids.get()) { bool* regen = regenerate_xml_or_string_ids.get();
if (regen && *regen) {
reset_id (); reset_id ();
} else { } else {
_id = str; _id = str;