Merge lp:~dangarner/xibo/client-170 into lp:xibo/1.7

Proposed by Dan Garner
Status: Merged
Merged at revision: 354
Proposed branch: lp:~dangarner/xibo/client-170
Merge into: lp:xibo/1.7
Diff against target: 35 lines (+6/-2)
2 files modified
client/dotNET/Media/PowerPoint.cs (+1/-2)
client/dotNET/app.config (+5/-0)
To merge this branch: bzr merge lp:~dangarner/xibo/client-170
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+245940@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'client/dotNET/Media/PowerPoint.cs'
--- client/dotNET/Media/PowerPoint.cs 2014-11-24 13:36:40 +0000
+++ client/dotNET/Media/PowerPoint.cs 2015-01-09 11:27:27 +0000
@@ -90,7 +90,7 @@
90 void webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)90 void webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
91 {91 {
92 // Get ready to show the control92 // Get ready to show the control
93 webBrowser.Visible = false;93 webBrowser.Visible = true;
94 }94 }
9595
96 protected override void Dispose(bool disposing)96 protected override void Dispose(bool disposing)
@@ -99,7 +99,6 @@
99 {99 {
100 Controls.Remove(webBrowser);100 Controls.Remove(webBrowser);
101 webBrowser.Dispose();101 webBrowser.Dispose();
102 GC.Collect();
103 }102 }
104 catch (Exception ex)103 catch (Exception ex)
105 {104 {
106105
=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config 2014-08-30 14:17:18 +0000
+++ client/dotNET/app.config 2015-01-09 11:27:27 +0000
@@ -2,4 +2,9 @@
2<configuration>2<configuration>
3 <configSections>3 <configSections>
4 </configSections>4 </configSections>
5<system.net>
6 <settings>
7 <servicePointManager expect100Continue="false"/>
8 </settings>
9 </system.net>
5</configuration>10</configuration>
6\ No newline at end of file11\ No newline at end of file

Subscribers

People subscribed via source and target branches