diff options
| author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
| commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
| tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/utils/copynpaste.cpp | |
| parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
| parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
| download | plus-490862919d79369112c75955a9c36ff8a081efd3.tar.gz plus-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 plus-490862919d79369112c75955a9c36ff8a081efd3.tar.xz plus-490862919d79369112c75955a9c36ff8a081efd3.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/utils/copynpaste.cpp')
| -rw-r--r-- | src/utils/copynpaste.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index d918c8108..763b579d0 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -1,7 +1,7 @@ /* * Retrieve string pasted depending on OS mechanisms. * Copyright (C) 2001-2010 Wormux Team - * Copyright (C) 2011 ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -442,9 +442,15 @@ bool runxsel(std::string& text, const char *p1, const char *p2) close(fd[0]); } if (p2) - execl("/usr/bin/xsel", "xsel", p1, p2, (char *)nullptr); + { + execl("/usr/bin/xsel", "xsel", p1, p2, + static_cast<char *>(nullptr)); + } else - execl("/usr/bin/xsel", "xsel", p1, (char *)nullptr); + { + execl("/usr/bin/xsel", "xsel", p1, + static_cast<char *>(nullptr)); + } exit(1); } |