Changeset e5cbbce in sasview

Timestamp:

Apr 14, 2017 4:07:02 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50, 7b15990, 2cda197, 481476c

Parents:

867aa79 (diff), 4f49f34 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (04/14/17 16:07:02)

git-committer:

GitHub <noreply@…> (04/14/17 16:07:02)

Message:

Merge pull request #90 from SasView?/SAS_OPENCL_856

BUG SAS_OPENCL config. Ref #856.

File:

• src/sas/sasgui/guiframe/gui_manager.py (modified) (1 diff)

src/sas/sasgui/guiframe/gui_manager.py

@@ -2129 +2129 @@
                 if "SAS_OPENCL" in line:
                     if sas_opencl:
-                        new_config_lines.append("SAS_OPENCL = \""+sas_opencl+"\"")
+                        new_config_lines.append("SAS_OPENCL = \"" + sas_opencl
+                                                + "\"\n")
                     else:
-                        new_config_lines.append("SAS_OPENCL = None")
+                        new_config_lines.append("SAS_OPENCL = \"None\"\n")
                 else:
                     new_config_lines.append(line)