This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit a1fd08789aec583c87d63e6d06fb6c23fdec50cb Author: David Capello <[email protected]> Date: Thu Nov 6 18:40:29 2014 -0300 Fix UIConext::isUiAvailable() for batch mode --- src/app/ui_context.cpp | 8 ++++++++ src/app/ui_context.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/ui_context.cpp b/src/app/ui_context.cpp index 9468042..ba6cf86 100644 --- a/src/app/ui_context.cpp +++ b/src/app/ui_context.cpp @@ -67,8 +67,16 @@ UIContext::~UIContext() ASSERT(documents().empty()); } +bool UIContext::isUiAvailable() const +{ + return App::instance()->isGui(); +} + DocumentView* UIContext::activeView() const { + if (!isUiAvailable()) + return NULL; + Workspace* workspace = App::instance()->getMainWindow()->getWorkspace(); WorkspaceView* view = workspace->activeView(); if (DocumentView* docView = dynamic_cast<DocumentView*>(view)) diff --git a/src/app/ui_context.h b/src/app/ui_context.h index 1455b77..5013c55 100644 --- a/src/app/ui_context.h +++ b/src/app/ui_context.h @@ -36,7 +36,7 @@ namespace app { UIContext(); virtual ~UIContext(); - virtual bool isUiAvailable() const { return true; } + bool isUiAvailable() const override; DocumentView* activeView() const; void setActiveView(DocumentView* documentView); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
