ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/xmltv_parser/trunk/xmltv_parser/main.cs

Comparing trunk/xmltv_parser/main.cs (file contents):
Revision 55 by william, Fri Mar 8 10:19:32 2013 UTC vs.
Revision 56 by william, Fri Mar 8 12:05:33 2013 UTC

#	Line 65 | Line 65 | namespace xmltv_parser
65		{
66		if (txtLog.InvokeRequired)
67		{
68	<	txtLog.Invoke((Action)(delegate { UpdateLogOutput(logmessage); }));
68	>	try
69	>	{
70	>	txtLog.Invoke((Action)(delegate { UpdateLogOutput(logmessage); }));
71	>	}
72	>	catch { }
73		return;
74		}
75		txtLog.AppendText(logmessage);
#	Line 161 | Line 165 | namespace xmltv_parser
165		IXMLTVRuntimeInstance xmltv = null;
166		bool status = false;
167		xmltv = XMLTV.DeSerialize(filename, out status);
168	+	XMLTV.CreateFromInstance(xmltv, new EventHandler<EventArgs>(XMLTV_OnInstanceCreated));
169		if (!status)
170		{
171		MessageBox.Show("Failed to load data - check log", "Failed to load data", MessageBoxButtons.OK, MessageBoxIcon.Error);
172		return;
173		}
174		MessageBox.Show("Successfully loaded data", "Successfully loaded data", MessageBoxButtons.OK, MessageBoxIcon.Information);
170	–	CreateControls();
175		}
176		catch (Exception ex)
177		{
#	Line 218 | Line 222 | namespace xmltv_parser
222		}
223		}
224
225	+	private void mnuItemExit_Click(object sender, EventArgs e)
226	+	{
227	+	this.Close();
228	+	}
229	+
230		}
231		}
232

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines