summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/gio/gio_content.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-03 16:00:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-03 21:54:58 +0200
commitfb58fc19c0c6e3c00f94161276a4f5dbe9db9096 (patch)
treeb5be5f4419eeb4b49a61f1ef61fc0e3909540a2b /ucb/source/ucp/gio/gio_content.cxx
parentc82dae439e8081fdcbfe68b2f2bc04190077a111 (diff)
loplugin:flatten in ucb
Change-Id: Ica7e5d3b5a5cec065f35f99d62b3b6604323601a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100009 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/ucp/gio/gio_content.cxx')
-rw-r--r--ucb/source/ucp/gio/gio_content.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 8576713974a8..87c50d498fc5 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -639,18 +639,18 @@ void Content::getFileInfo(
css::uno::Reference<css::ucb::XCommandEnvironment> const & env, GFileInfo ** info, bool fail)
{
assert(info != nullptr);
- if (*info == nullptr)
+ if (*info != nullptr)
+ return;
+
+ GError * err = nullptr;
+ *info = getGFileInfo(env, &err);
+ if (*info == nullptr && !mbTransient && fail)
{
- GError * err = nullptr;
- *info = getGFileInfo(env, &err);
- if (*info == nullptr && !mbTransient && fail)
- {
- ucbhelper::cancelCommandExecution(mapGIOError(err), env);
- }
- else if (err != nullptr)
- {
- g_error_free(err);
- }
+ ucbhelper::cancelCommandExecution(mapGIOError(err), env);
+ }
+ else if (err != nullptr)
+ {
+ g_error_free(err);
}
}