Don't crash when starting proxy fails

This commit is contained in:
Latif Khalifa
2013-12-04 16:04:18 +01:00
parent c30624a1e1
commit aeaf17d470
3 changed files with 21 additions and 4 deletions

View File

@@ -73,6 +73,8 @@ public partial class MainWindow
{
if (data != null && data is OSDMap)
{
messages.Messages.Clear();
OSDMap map = (OSDMap)data;
OSDArray msgs = (OSDArray)map["Messages"];
foreach (var msgOSD in msgs)

View File

@@ -4,9 +4,9 @@ using System.Collections.Concurrent;
using Gtk;
using GridProxyGUI;
using OpenMetaverse.Packets;
using Logger = OpenMetaverse.Logger;
using System.Timers;
using System.Text.RegularExpressions;
using Nwc.XmlRpc;
public partial class MainWindow : Gtk.Window
{
@@ -104,7 +104,7 @@ public partial class MainWindow : Gtk.Window
{
string loginType;
if (request is XmlRpcRequest)
if (request is Nwc.XmlRpc.XmlRpcRequest)
{
loginType = "Login Request";
}
@@ -290,8 +290,22 @@ public partial class MainWindow : Gtk.Window
protected void StartPoxy()
{
AppendLog("Starting proxy..." + Environment.NewLine);
proxy = new ProxyManager(txtPort.Text, cbListen.ActiveText, cbLoginURL.ActiveText);
proxy.Start();
try
{
proxy = new ProxyManager(txtPort.Text, cbListen.ActiveText, cbLoginURL.ActiveText);
proxy.Start();
}
catch
{
Logger.Log("Failed to start proxy", OpenMetaverse.Helpers.LogLevel.Error);
try
{
proxy.Stop();
proxy = null;
}
catch { }
btnStart.Label = "Start Proxy";
}
}
protected void StopProxy()

View File

@@ -28,6 +28,7 @@ namespace GridProxyGUI
Model = Messages = new ListStore(typeof(Session));
HeadersVisible = true;
Selection.Mode = SelectionMode.Multiple;
ShowAll();
}