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
1=== modified file 'client/dotNET/Media/PowerPoint.cs'
2--- client/dotNET/Media/PowerPoint.cs 2014-11-24 13:36:40 +0000
3+++ client/dotNET/Media/PowerPoint.cs 2015-01-09 11:27:27 +0000
4@@ -90,7 +90,7 @@
5 void webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
6 {
7 // Get ready to show the control
8- webBrowser.Visible = false;
9+ webBrowser.Visible = true;
10 }
11
12 protected override void Dispose(bool disposing)
13@@ -99,7 +99,6 @@
14 {
15 Controls.Remove(webBrowser);
16 webBrowser.Dispose();
17- GC.Collect();
18 }
19 catch (Exception ex)
20 {
21
22=== modified file 'client/dotNET/app.config'
23--- client/dotNET/app.config 2014-08-30 14:17:18 +0000
24+++ client/dotNET/app.config 2015-01-09 11:27:27 +0000
25@@ -2,4 +2,9 @@
26 <configuration>
27 <configSections>
28 </configSections>
29+<system.net>
30+ <settings>
31+ <servicePointManager expect100Continue="false"/>
32+ </settings>
33+ </system.net>
34 </configuration>
35\ No newline at end of file

Subscribers

People subscribed via source and target branches