ready for release

preferencesAboutTextFull
Claudio Valerio 11 years ago
parent e516d2e9df
commit cff1849fd0
  1. 2
      OpenBoard.pro
  2. 4
      src/core/UBSceneCache.cpp

@ -11,7 +11,7 @@ CONFIG += debug_and_release \
VERSION_MAJ = 1 VERSION_MAJ = 1
VERSION_MIN = 02 VERSION_MIN = 02
VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error
VERSION_PATCH = 01 VERSION_PATCH = 00
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "") VERSION = $$replace(VERSION, "\\.r", "")

@ -127,11 +127,7 @@ UBGraphicsScene* UBSceneCache::value(UBDocumentProxy* proxy, int pageIndex)
void UBSceneCache::removeScene(UBDocumentProxy* proxy, int pageIndex) void UBSceneCache::removeScene(UBDocumentProxy* proxy, int pageIndex)
{ {
UBGraphicsScene* scene = value(proxy, pageIndex); UBGraphicsScene* scene = value(proxy, pageIndex);
#ifdef Q_WS_MAC
if (scene && scene->views().size() == 0)
#else
if (scene && !scene->isActive()) if (scene && !scene->isActive())
#endif
{ {
UBSceneCacheID key(proxy, pageIndex); UBSceneCacheID key(proxy, pageIndex);
int count = QHash<UBSceneCacheID, UBGraphicsScene*>::remove(key); int count = QHash<UBSceneCacheID, UBGraphicsScene*>::remove(key);

Loading…
Cancel
Save