Skip to content

Commit d1ba536

Browse files
committed
fixed now
Signed-off-by: Michael Oliver <mcoliver@gmail.com>
1 parent 150b691 commit d1ba536

File tree

3 files changed

+36
-15
lines changed

3 files changed

+36
-15
lines changed

src/lib/app/mu_rvui/mode_manager.mu

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -751,19 +751,28 @@ class: ModeManagerMode : MinorMode
751751

752752
method: viewChange (void; Event event, bool on)
753753
{
754-
event.reject();
754+
try
755+
{
756+
event.reject();
755757

756-
let vnode = viewNode();
757-
if (vnode eq nil || vnode == "") return;
758+
let vnode = viewNode();
759+
if (vnode eq nil || vnode == "") return;
758760

759-
let vtype = nodeType(vnode),
760-
name = if vtype.substr(0,2) == "RV" then vtype.substr(2,0) + "_edit_mode" else "",
761-
entry = findModeEntry(name);
761+
let vtype = nodeType(vnode);
762+
if (vtype eq nil || vtype == "") return;
762763

763-
if (entry neq nil)
764-
{
765-
activateEntry(entry, on);
766-
if (on) sendInternalEvent("view-edit-mode-activated");
764+
let name = if vtype.substr(0,2) == "RV" then vtype.substr(2,0) + "_edit_mode" else "",
765+
entry = findModeEntry(name);
766+
767+
if (entry neq nil)
768+
{
769+
activateEntry(entry, on);
770+
if (on) sendInternalEvent("view-edit-mode-activated");
771+
}
772+
}
773+
catch (exception exc)
774+
{
775+
print("ERROR: mode_manager viewChange: " + string(exc) + "\\n");
767776
}
768777
}
769778

src/lib/app/mu_rvui/wipes.mu

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,13 +465,22 @@ class: Wipe : MinorMode
465465
{
466466
event.reject();
467467
removeTags();
468-
set(viewNode() + ".ui.wipes", 1);
468+
469+
let vnode = viewNode();
470+
if (vnode neq nil && vnode != "")
471+
{
472+
set(vnode + ".ui.wipes", 1);
473+
}
469474
}
470475

471476
method: afterGraphViewChange (void; Event event)
472477
{
473478
event.reject();
474-
if (nodeType(viewNode()) != "RVStackGroup")
479+
480+
let vnode = viewNode();
481+
if (vnode eq nil || vnode == "") return;
482+
483+
if (nodeType(vnode) != "RVStackGroup")
475484
{
476485
toggle();
477486
}

src/plugins/rv-packages/session_manager/transform_manip.mu

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,12 @@ class: TransformManip : MinorMode
338338

339339
method: findEditingNodes (void; bool setStates=true)
340340
{
341-
let vnode = viewNode(),
342-
infos = metaEvaluateClosestByType(frame(), "RVTransform2D"),
343-
(ins, outs) = nodeConnections(viewNode(), false);
341+
let vnode = viewNode();
342+
if (vnode eq nil || vnode == "") return;
343+
344+
// Use an explicit type declaration here so that infos is correctly MetaEvalInfo[]
345+
let infos = metaEvaluateClosestByType(frame(), "RVTransform2D"),
346+
(ins, outs) = nodeConnections(vnode, false);
344347

345348
_editNodes = EditNodePair[]();
346349

0 commit comments

Comments
 (0)