4 files changed, 30 insertions, 7 deletions
diff --git a/Sluift/SluiftClient.cpp b/Sluift/SluiftClient.cpp
index e8c43c9..5243ed0 100644
--- a/Sluift/SluiftClient.cpp
+++ b/Sluift/SluiftClient.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -48,6 +48,9 @@ SluiftClient::~SluiftClient() {
 }
 
 void SluiftClient::connect() {
+    if (client->isActive()) {
+        throw Lua::Exception("Client is already connecting or connected");
+    }
     rosterReceived = false;
     blockListReceived = false;
     disconnectedError = boost::optional<ClientError>();
diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp
index e1d1738..126562e 100644
--- a/Sluift/SluiftComponent.cpp
+++ b/Sluift/SluiftComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -41,6 +41,9 @@ SluiftComponent::~SluiftComponent() {
 }
 
 void SluiftComponent::connect(const std::string& host, int port) {
+    if (component->isActive()) {
+        throw Lua::Exception("Component is already connecting or connected");
+    }
     disconnectedError = boost::optional<ComponentError>();
     component->connect(host, port);
 }
diff --git a/Swiften/Component/CoreComponent.cpp b/Swiften/Component/CoreComponent.cpp
index 3896bdd..5b2277b 100644
--- a/Swiften/Component/CoreComponent.cpp
+++ b/Swiften/Component/CoreComponent.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -166,4 +166,12 @@ void CoreComponent::sendData(const std::string& data) {
     sessionStream_->writeData(data);
 }
 
+bool CoreComponent::isActive() const {
+    return session_ || connector_;
+}
+
+bool CoreComponent::isAvailable() const {
+    return stanzaChannel_->isAvailable();
+}
+
 }
diff --git a/Swiften/Component/CoreComponent.h b/Swiften/Component/CoreComponent.h
index f673643..1a487d2 100644
--- a/Swiften/Component/CoreComponent.h
+++ b/Swiften/Component/CoreComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -61,9 +61,18 @@ namespace Swift {
                 return stanzaChannel_;
             }
 
-            bool isAvailable() const {
-                return stanzaChannel_->isAvailable();
-            }
+            /**
+             * Checks whether the component is connected to the server,
+             * and stanzas can be sent.
+             */
+            bool isAvailable() const;
+
+            /**
+             * Checks whether the component is active.
+             *
+             * A component is active when it is connected or connecting to the server.
+             */
+            bool isActive() const;
 
             /**
              * Returns the JID of the component