fixing opening .jsrep file when there was different file from another…

… project opened before
jsreport · Dec 10, 2014 · dfb0688 · dfb0688
1 parent b36d7dc
commit dfb0688
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/JsReportVSTools/Impl/ReportingServerManagerAdapter.cs b/JsReportVSTools/Impl/ReportingServerManagerAdapter.cs
@@ -58,10 +58,10 @@ public string CurrentBinFolder
 
         private Project GetActiveProject(string fileName = null)
         {
-            if (_dte.ActiveDocument != null)
-                return _dte.ActiveDocument.ProjectItem.ContainingProject;
+            if (fileName != null)
+                return _dte.Solution.FindProjectItem(fileName).ContainingProject;
 
-            return _dte.Solution.FindProjectItem(fileName).ContainingProject;
+            return _dte.ActiveDocument.ProjectItem.ContainingProject;
         }
 
         public async Task EnsureStartedAsync(string fileName = null)
@@ -88,6 +88,7 @@ public async Task EnsureStartedAsync(string fileName = null)
                 }
                 catch (Exception e)
                 {
+                    CurrentProject = null;
                     _serverManager = null;
                     Trace.TraceError("Failed to start jsreport server " + e);
                     throw;

diff --git a/JsReportVSTools/source.extension.vsixmanifest b/JsReportVSTools/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="60546472-b12d-4ad6-b5ea-74401d44d9fc" Version="0.2.7" Language="en-US" Publisher="Jan Blaha" />
+    <Identity Id="60546472-b12d-4ad6-b5ea-74401d44d9fc" Version="0.2.8" Language="en-US" Publisher="Jan Blaha" />
     <DisplayName>jsreport visual studio tools beta</DisplayName>
     <Description xml:space="preserve">Extension allowing to use jsreport open source reporting platform inside visual studio. It allows to create any pdf report you can think of without lame designers just using html and javascript.</Description>
     <MoreInfo>http://jsreport.net/</MoreInfo>