Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
22e69897
Commit
22e69897
authored
8 years ago
by
AndreyL ProductEngine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-6605 Fix for the crash in LLClipboard::addToClipboard() - Added the exception handling
parent
bcadc2c1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llui/llclipboard.cpp
+9
-1
9 additions, 1 deletion
indra/llui/llclipboard.cpp
with
9 additions
and
1 deletion
indra/llui/llclipboard.cpp
+
9
−
1
View file @
22e69897
...
@@ -123,7 +123,15 @@ bool LLClipboard::copyToClipboard(const LLWString &src, S32 pos, S32 len, bool u
...
@@ -123,7 +123,15 @@ bool LLClipboard::copyToClipboard(const LLWString &src, S32 pos, S32 len, bool u
// Concatenate the input string to the LL and the system clipboard
// Concatenate the input string to the LL and the system clipboard
bool
LLClipboard
::
addToClipboard
(
const
LLWString
&
src
,
S32
pos
,
S32
len
,
bool
use_primary
)
bool
LLClipboard
::
addToClipboard
(
const
LLWString
&
src
,
S32
pos
,
S32
len
,
bool
use_primary
)
{
{
mString
=
src
.
substr
(
pos
,
len
);
try
{
mString
=
src
.
substr
(
pos
,
len
);
}
catch
(
const
std
::
exception
&
e
)
{
LL_WARNS
()
<<
"Can't add the substring to clipboard: "
<<
e
.
what
()
<<
LL_ENDL
;
return
false
;
}
return
(
use_primary
?
LLView
::
getWindow
()
->
copyTextToPrimary
(
mString
)
:
LLView
::
getWindow
()
->
copyTextToClipboard
(
mString
));
return
(
use_primary
?
LLView
::
getWindow
()
->
copyTextToPrimary
(
mString
)
:
LLView
::
getWindow
()
->
copyTextToClipboard
(
mString
));
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment