summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/guild.cpp2
-rw-r--r--src/party.cpp2
-rw-r--r--src/utils/copynpaste.cpp3
3 files changed, 5 insertions, 2 deletions
diff --git a/src/guild.cpp b/src/guild.cpp
index 5d129e11e..a2b85b6c1 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -255,7 +255,7 @@ void Guild::setRights(short rights)
bool Guild::isMember(GuildMember *member) const
{
- if (member->mGuild > 0 && member->mGuild != this)
+ if (member->mGuild && member->mGuild != this)
return false;
MemberList::const_iterator itr = mMembers.begin(),
diff --git a/src/party.cpp b/src/party.cpp
index f561ca49f..cb45fa355 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -220,7 +220,7 @@ bool Party::isMember(PartyMember *member) const
if (!member)
return false;
- if (member->mParty > 0 && member->mParty != this)
+ if (member->mParty && member->mParty != this)
return false;
MemberList::const_iterator itr = mMembers.begin();
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 6d1c675d3..ed9f0f641 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -284,6 +284,9 @@ bool sendBuffer(std::string& text)
}
#elif USE_X11
+
+#include <unistd.h>
+
static char* getSelection2(Display *dpy, Window us, Atom selection,
Atom request_target)
{