Skip to content

wrap invokeScript in try/catch #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2022
Merged

wrap invokeScript in try/catch #230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions SharedProject/Output/OutputToolWindowControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@ public OutputToolWindowControl(ScriptManager scriptManager,IFCCEngine fccEngine)
});
};


this.fccEngine = fccEngine;
}
}

protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
{
Expand All @@ -114,23 +113,27 @@ protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)

private void OutputToolWindowControl_Loaded(object sender, RoutedEventArgs e)
{
if (!hasLoaded)
{
if(FCCOutputBrowser.Document == null)
{
fccEngine.ReadyForReport();
}

hasLoaded = true;
if (!hasLoaded)
{
fccEngine.ReadyForReport();
FCCOutputBrowser.Visibility = Visibility.Visible;
}
hasLoaded = false;
}
}

public object InvokeScript(string scriptName, params object[] args)
{
if (FCCOutputBrowser.Document != null)
{
return FCCOutputBrowser.InvokeScript(scriptName, args);
try
{
// Can use FCCOutputBrowser.IsLoaded but
// it is possible for this to be successful when IsLoaded false.
return FCCOutputBrowser.InvokeScript(scriptName, args);
}
catch {
// todo what to do about missed
}
}
return null;
}
Expand Down