Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
hoffstadt committed Aug 12, 2020
2 parents 871a060 + e7e2e17 commit 3b387b2
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions DearPyGui/src/Core/mvMarvel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2884,18 +2884,13 @@ namespace Marvel {
&tip, &parent, &before))
return mvPythonTranslator::GetPyNone();

auto parentItem = mvApp::GetApp()->topParent();
//auto parentItem = mvApp::GetApp()->topParent();

if (parentItem == nullptr)
ThrowPythonException("add_menu must follow a call to add_menubar.");
mvAppItem* item = new mvMenu("", name);
item->setTip(tip);
AddItemWithRuntimeChecks(item, parent, before);
mvApp::GetApp()->pushParent(item);

else
{
mvAppItem* item = new mvMenu("", name);
item->setTip(tip);
AddItemWithRuntimeChecks(item, parent, before);
mvApp::GetApp()->pushParent(item);
}


return mvPythonTranslator::GetPyNone();
Expand Down

0 comments on commit 3b387b2

Please sign in to comment.