From bdbf807565f868b0925633644aebede520314c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elo=C3=ADzio=20Salgado?= <eloisalgado@gmail.com>
Date: Tue, 24 Jan 2017 18:46:50 -0200
Subject: [PATCH] Fixing activeTool for configurable defaultTool

---
 Packages/ohif-viewerbase/client/lib/toolManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Packages/ohif-viewerbase/client/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js
index 8ca1bf400..0fb3e146c 100644
--- a/Packages/ohif-viewerbase/client/lib/toolManager.js
+++ b/Packages/ohif-viewerbase/client/lib/toolManager.js
@@ -423,7 +423,8 @@ export const toolManager = {
         Session.set('ToolManagerActiveTool', tool);
     },
     getActiveTool() {
-        if (!activeTool) {
+        // If toolManager is not initialized, we should set as defaultTool
+        if (!initialized) {
             activeTool = defaultTool;
         }