Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
27a9461b
Commit
27a9461b
authored
11 years ago
by
Emmanuel Lepage Vallee
Browse files
Options
Downloads
Patches
Plain Diff
[ #14268 ] daemon: Fix a race hash collision when creating new accounts too fast (fix last commit)
parent
d984aa86
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/managerimpl.cpp
+2
-3
2 additions, 3 deletions
daemon/src/managerimpl.cpp
with
2 additions
and
3 deletions
daemon/src/managerimpl.cpp
+
2
−
3
View file @
27a9461b
...
@@ -2507,13 +2507,12 @@ ManagerImpl::addAccount(const std::map<std::string, std::string>& details)
...
@@ -2507,13 +2507,12 @@ ManagerImpl::addAccount(const std::map<std::string, std::string>& details)
// Add the newly created account in the account order list
// Add the newly created account in the account order list
newAccountID
+=
"/"
;
if
(
not
accountList
.
empty
())
{
if
(
not
accountList
.
empty
())
{
// Prepend the new account
// Prepend the new account
accountList
.
insert
(
0
,
newAccountID
);
accountList
.
insert
(
0
,
newAccountID
+
"/"
);
preferences
.
setAccountOrder
(
accountList
);
preferences
.
setAccountOrder
(
accountList
);
}
else
{
}
else
{
accountList
=
newAccountID
;
accountList
=
newAccountID
+
"/"
;
preferences
.
setAccountOrder
(
accountList
);
preferences
.
setAccountOrder
(
accountList
);
}
}
...
...
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