From 3b5e70580e7e4532de8fb8d9765be647ccc74412 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Mon, 27 Jun 2011 22:50:21 +0100
Subject: [PATCH] Fix from_state in TorrentAddedEvent

---
 deluge/core/torrentmanager.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 014bfad6d..a3b8ca671 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -509,16 +509,14 @@ class TorrentManager(component.Component):
             self.save_state()
 
         # Emit torrent_added signal
-        from_state = False
-        if torrent_info and state is None:
-            from_state = True
+        from_state = state is not None
         component.get("EventManager").emit(
             TorrentAddedEvent(torrent.torrent_id, from_state)
         )
         log.info("Torrent %s from user \"%s\" %s",
                  torrent.get_status(["name"])["name"],
                  torrent.get_status(["owner"])["owner"],
-                 (from_state and "added" or "loaded"))
+                 (from_state and "loaded" or "added"))
         return torrent.torrent_id
 
     def load_torrent(self, torrent_id):