(#449) Minor fixes related to isActive

This commit is contained in:
Magne Sjaastad
2015-09-15 10:45:39 +02:00
parent 9aeb949b06
commit 08e266c2f3
6 changed files with 94 additions and 69 deletions

View File

@@ -25,6 +25,7 @@
#include "RimProject.h"
#include "RimView.h"
#include "RimViewLink.h"
#include "RimViewLinker.h"
#include "RiuCadNavigation.h"
@@ -264,7 +265,11 @@ void RiuViewer::slotSetCurrentFrame(int frameIndex)
RimViewLinker* viewLinker = proj->findViewLinkerFromView(m_reservoirView);
if (viewLinker)
{
viewLinker->updateTimeStep(m_reservoirView, frameIndex);
RimViewLink* viewLink = viewLinker->viewLinkFromView(m_reservoirView);
if (m_reservoirView == viewLinker->mainView() || (viewLink && viewLink->isActive() && viewLink->syncTimeStep()))
{
viewLinker->updateTimeStep(m_reservoirView, frameIndex);
}
}
}
}