From 183195508e8f45bc571fac8955789e70570b8a1b Mon Sep 17 00:00:00 2001 From: David Robillard <d@drobilla.net> Date: Fri, 4 Sep 2015 22:28:28 +0000 Subject: Fix various atom conversion issues. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5719 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/Port.cpp | 2 +- src/gui/RenameWindow.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index b66450ff..ca31e445 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -266,7 +266,7 @@ Port::build_uri_menu() } LilvNode* designation = lilv_new_uri( - world->lilv_world(), designation_atom.ptr<char>()); + world->lilv_world(), world->forge().str(designation_atom, false).c_str()); LilvNode* rdfs_range = lilv_new_uri( world->lilv_world(), LILV_NS_RDFS "range"); diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index d4e3b9a4..5020f6ef 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -116,7 +116,8 @@ RenameWindow::ok_clicked() Raul::Path path = _object->path(); const Atom& name_atom = _object->get_property(uris.lv2_name); - if (!label.empty() && (!name_atom.is_valid() || label != name_atom.ptr<char>())) { + if (!label.empty() && (name_atom.type() != uris.forge.String || + label != name_atom.ptr<char>())) { _app->set_property(Node::path_to_uri(path), uris.lv2_name, _app->forge().alloc(label)); -- cgit v1.2.1