Merge branch 'ryzom/silan_refactoring' into yubo

merge-requests/7/merge
Nuno 3 years ago
commit 7af0b752f8

@ -1578,6 +1578,13 @@ void setLoadingContinent (CContinent *continent)
void initWelcomeWindow() void initWelcomeWindow()
{ {
CSessionBrowserImpl &sb = CSessionBrowserImpl::getInstance();
if (sb.CurrentJoinMode!=CFarTP::LaunchEditor && NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:WELCOME")->getValueBool())
{
std::vector<string> v;
CWidgetManager::getInstance()->runProcedure ("welcome_opened", NULL, v);
}
/*
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CInterfaceGroup* welcomeWnd = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:welcome_info")); CInterfaceGroup* welcomeWnd = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:welcome_info"));
if(welcomeWnd) if(welcomeWnd)
@ -1585,7 +1592,7 @@ void initWelcomeWindow()
bool welcomeDbProp = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:WELCOME")->getValueBool(); bool welcomeDbProp = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:WELCOME")->getValueBool();
CSessionBrowserImpl &sb = CSessionBrowserImpl::getInstance(); CSessionBrowserImpl &sb = CSessionBrowserImpl::getInstance();
welcomeWnd->setActive((sb.CurrentJoinMode!=CFarTP::LaunchEditor) && welcomeDbProp); welcomeWnd->setActive((sb.CurrentJoinMode!=CFarTP::LaunchEditor) && welcomeDbProp);
} }*/
} }
// *************************************************************************** // ***************************************************************************

Loading…
Cancel
Save