AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-13 23:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

switched to unique_ptr due to expected app main use

Browse Source
This commit is contained in:
Jack Andersen
2015-08-18 12:50:52 -10:00
parent 87ab129e01
commit 2c2991d44e
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/x11/ApplicationUnix.cpp
View File

@@ -48,7 +48,7 @@ namespace boo
{
IApplication* APP = NULL;
std::shared_ptr<IApplication> ApplicationBootstrap(IApplication::EPlatformType platform,
std::unique_ptr<IApplication> ApplicationBootstrap(IApplication::EPlatformType platform,
IApplicationCallback& cb,
const std::string& uniqueName,
const std::string& friendlyName,
@@ -56,17 +56,16 @@ std::shared_ptr<IApplication> ApplicationBootstrap(IApplication::EPlatformType p
const std::vector<std::string>& args,
bool singleInstance)
{
if (!APP)
{
if (platform == IApplication::PLAT_WAYLAND)
APP = new ApplicationWayland(cb, uniqueName, friendlyName, pname, args, singleInstance);
else if (platform == IApplication::PLAT_XCB ||
platform == IApplication::PLAT_AUTO)
APP = new ApplicationXCB(cb, uniqueName, friendlyName, pname, args, singleInstance);
else
return std::shared_ptr<IApplication>();
}
return std::shared_ptr<IApplication>(APP);
if (APP)
return std::unique_ptr<IApplication>();
if (platform == IApplication::PLAT_WAYLAND)
APP = new ApplicationWayland(cb, uniqueName, friendlyName, pname, args, singleInstance);
else if (platform == IApplication::PLAT_XCB ||
platform == IApplication::PLAT_AUTO)
APP = new ApplicationXCB(cb, uniqueName, friendlyName, pname, args, singleInstance);
else
return std::unique_ptr<IApplication>();
return std::unique_ptr<IApplication>(APP);
}
}