From 92f0a83a8d0c37524977908bd3447df1039f950f Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Mon, 4 Aug 2008 16:14:43 +0000 Subject: Client: Fixed up startup request retained Previously, the XML-RPC request for the retained items would take place before the InstaDiscThread started, thus causing an error when the remote server attempted sending an item. Now it is run after the InstaDiscThread starts. --- client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java | 10 +++++----- client/trunk/src/com/fourisland/instadisc/InstaDiscView.java | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'client/trunk') diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java b/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java index eac82d9..e1705f1 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscApp.java @@ -61,15 +61,15 @@ public class InstaDiscApp extends SingleFrameApplication { } catch (NullPointerException ex) { notInit = true; } - + if (notInit) { Thread th = new Thread(new FirstRunWizard()); th.start(); } else { - XmlRpc xmlrpc = new XmlRpc("requestRetained"); - xmlrpc.execute(); - - if (!((args.length > 0) && (args[0].equals("-r")))) { + if ((args.length > 0) && (args[0].equals("-r"))) { + XmlRpc xmlrpc = new XmlRpc("requestRetained"); + xmlrpc.execute(); + } else { launch(InstaDiscApp.class, args); } } diff --git a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java index ad56681..12e1dbd 100644 --- a/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java +++ b/client/trunk/src/com/fourisland/instadisc/InstaDiscView.java @@ -115,6 +115,9 @@ public class InstaDiscView extends FrameView { InstaDiscThread idt = new InstaDiscThread(); Thread idtt = new Thread(idt); idtt.start(); + + XmlRpc xmlrpc = new XmlRpc("requestRetained"); + xmlrpc.execute(); } @Action -- cgit 1.4.1